Merge "Revert "Reduce lock contention in ContextImpl"" into main