Merge "NavBar: Use rotation watcher am: a98b32cea2 am: c5d9eb8ebd" into nyc-mr1-dev-plus-aosp