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

Change-Id: I171fab2d76e1822cadc3b217b00fbe4846e95ba6