am 6d0e2c9c: Merge "Trim navigation bar buttons" into lmp-mr1-dev

* commit '6d0e2c9cb948a10137e6b5a4eb00e601622fe8ee':
  Trim navigation bar buttons