Merge "Remove the unnecessary preferenceCategory"