Use WaitWithContext for WaitStop Upstream-commit: b59ee9486fad5fa19f3d0af0eb6c5ce100eae0fc Component: engine