Merge "Code cleaning for PreferenceActivity"