Fix config cleanup on canceling restartmanager Upstream-commit: 717f0c95b59b215c07af2d2b2dd06b1246d174ca Component: engine