Merge "Reduce contention during view-based category count refreshes"