Merge "Catch CancellationException that can be thrown by Future" into main