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

* commit '75f2c438c25e26edf26a2ca6287ffc27d606196f':
  Fix clipping wrapped Button text