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