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

* commit 'cbd48c722a40aff8bc2855d735bd34159b5df8ba':
  Honey I shrunk the navigation bar