Merge "Revert "Use instrumentation arg to prevent unnecessary delays in unit tests"" into main