Merge changes from topic "presubmit-am-8d46ef8e146342db89da2c1ff44742ea" into tm-dev

* changes:
  Tell NavigationBarView when mode changes.
  Revert "Revert "Remove Dep.get(CommandQueue.class) from NavBarView""