Merge "Avoiding unconditional 5 sec wait in the beginning of inproc tests" into main