Remove special handling so we can collapse nag, set collapse nag at 767 [#53710013]
Merge branch 'feature-53710013-Collapse_nav'