Bug 850386 - Ensure alarms are displayed properly
Merge pull request #8602 from KevinGrandon/bug_850386_alarm_display

Bug 850386 - Ensure alarms are displayed properly r=lightsofapollo