Remove deadlock in ContainerWait Upstream-commit: d98d4faef86c4ba4470c7f28c2ce92c10de4a565 Component: engine