Ensure clean engine shutdown on startup errors Upstream-commit: e4b753c1de558a07a8a079b39013677211badbd7 Component: engine