Merge "Fix zen alarms only mode check"