Only show extra nav border on layout nav

Closes #32700

See merge request !11657