Fix race condition during socket creation Upstream-commit: 8ac516094e5b90351cbb436477f06730b1b5e38d Component: engine