Merge "Only show AlarmActivity for firing alarms" into lmp-mr1-dev