Merge "Remove alarms from DB when they are cleared"