Merge "Rename CategorySelector to CategoryMultiselectWidget"