Merge "Fix home/back buttons flow in PreferenceActivity."