Merge "Revert^2 "Disable concurrent mode when instrumentation is loaded"" into main