Merge "Add logging for when cancel times out"