Merge "Remove CategoryManager from SettingsLib."