Merge "Add new PreferenceActivity API for settings."