Cancelling a scope before it yields puts task in a bad state

We encoutered an issue where a scope was cancelled by another thread before it yielded, and this seemed to put the task into a bad state such that it did not make further progress (and in particular, did not release an acquired lock). We should ensure that cancellation works properly in this case.