Merge "Reduce locking in ContextHubTransactionManager" into main