Merge "Enable users to watch category membership changes"