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

Change-Id: I0c7b9118cdf37f321772865caa835cdb76b79b97