Merge "Zen: handle exit conditions across reboots." into lmp-dev