Merge "Move category membership RC updates to CategoryMembershipChangeJob"