Merge "Remove PreferenceCategory wrapper"