Merge "[MON] Fixes notifier bug during alarm triggering"