Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev