Merge "Don't log cancellation exception"