Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev