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