Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am: 27c3c34fe1
am: 9f36729f4d

Change-Id: Ic82cf732a685f2f3730594ec0880727ce2d4a0fa