Merge "Fix calendar alarms not being triggered after 22h"