Merge "Revert "NavBar: Don't reorient as much, its a waste of work"" into oc-dr1-dev