Merge "Make updateCategoryCounts() have better lag checks"