Fix race between two ContainerRm Upstream-commit: e07769bc5a50355d972cbc71d150dc2d339f7370 Component: engine