Merge "Various PreferenceActivity and related improvement."