Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-dev