* commit '551f0778c39b030ebf1fd51c882c152b3e7ac320': Zen: Pull next-alarm tracking out into separate helper.