Only reorient nav bar if needed
am: 090b7d82d2

Change-Id: Ib45e3a9ebadd719b392b22278eab83d7bc56d407