Merge "Update 'next alarm' tracking"