Merge "Create a new PreferenceCategory for the current AP."