Merge "Pressed the "dim" button on the clock one too many times." into lmp-dev