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