Merge "Reduce lock contention when debugging"