Merge "Fix QueueStats to use a ConcurrentMap"