Merge "Fix fragment back navigation in PreferenceActivity with predictive back" into main