am edc9d109: am 75f2c438: Merge "Fix clipping wrapped Button text" into lmp-mr1-dev

* commit 'edc9d109c233f6a4096a4766684bd3e631bbc00a':
  Fix clipping wrapped Button text