Merge "Keep the test helper process unfrozen during the test" into main