fix confidential border issue as well as confidential styles leaking on new MR

Closes gitlab-ee#3121

See merge request !13388