Merge "Make emergency button right size" into lmp-mr1-dev