Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev