Merge "Remove intent-filter from PrivacySettingsActivity"