Merge "Fix clipping wrapped Button text" into lmp-mr1-dev