Merge "Update enabled state of ZenRulePreference"