Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev