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

Change-Id: I6061263be749e62c315bf9865e587536b7159fbb