Merge "Fix GoogleSettings check in PrivacySettings"