Revert "Navbar merge fixes"

This reverts commit 9ec924d49d4ba434707eda95358c7a3a58ab0548.
Merge "Revert "Navbar merge fixes"" into jb-mr2