am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev
automerge: 71cf9e5

* commit '71cf9e58a14b942ad313d0c5c280e207933e9841':
  Honey I shrunk the navigation bar