Merge "Update PreferenceFragmentCompat with changes from PreferenceFragment" into mnc-dev