Merge "Add handling of simultaneous alarms/timers" into main