Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev