Merge "Modified the PrivacySettings and add PreferenceControllers"