Do not remove container if underlying resource cleanup failed Upstream-commit: b875e126dd574039efb3c5a35b160fb940054253 Component: engine