fix container restart race condition Upstream-commit: d57591803847ea1492ee74cb1199407059ab6c63 Component: engine