Fixing flaky tests on Windows (again) Upstream-commit: 77f501a0c6f1b584aeb0e0856e6af1ba1fbdc156 Component: engine