fix 2 corner cases in container create cleanup and container removal Upstream-commit: 5efb37616ffd4b848578424ebb7b290af9965eff Component: engine
fix 2 corner cases in container create cleanup and container removal Upstream-commit: 5efb37616ffd4b848578424ebb7b290af9965eff Component: engine