Merge "Revert "NavBar: Don't reorient as much, its a waste of work"" into...
Merge "Revert "NavBar: Don't reorient as much, its a waste of work"" into oc-dr1-dev am: 6683cc6a am: a23c062b
am: 06a5cb86
Change-Id: If19740d6f53925233102e874cc3609b022152b6a