Merge "Remove custom style for preferenceFragmentStyle"