Merge "Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests"