Fix hanging integration tests Upstream-commit: 8510adf8c856d6f0871650216a0e1d7e6ece46ee Component: engine