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

Change-Id: Iac6962fe8848504907a48a5019c12ae2119b2c4d