Merge "mark categories as complete when disabled." into nyc-dev