Merge "Add category key for EnterprisePrivacySettings"