Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev am: 587b673e5b
am: 6d04eb6ce0

Change-Id: I4fd24b45df515473cea5510766679e3254614b11