Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk"