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

Change-Id: I44ebbfe68ec1e891f4fde2b28fcc7847d25f4940