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

* commit 'd1fa286b7ff19b0c342a253184eed5f9ea6199c2':
  Fix clipping wrapped Button text