Merge "Reduce lock contention when debugging" into lmp-dev