Merge "Move handing of a "cancel" inside try-finally block"