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

Change-Id: Ia1a2185299c4b5183991909a40918e30555129a4