Merge "Make getScopedLockAndFlush() in Category::refreshCounts non-blocking" into...