Fix race condition between cleanup and Start Upstream-commit: c4a190db0c7020ee39672421d1bbca3678f86683 Component: engine