Merge "PreferenceActivity Fragment security"