2229c82dc4
We have explicit cancellation checks between phases and inside locks, so it is worth adding the check after `checkIsResolved`