Merge "UX polish on Alarm and Clock tabs" into lmp-dev