Merge "NavBar: Use rotation watcher" into nyc-mr1-dev