Query timeout counter is not updated in all timeouts cases

The OverallQueryMetrics query timeout counter and global query timeout counter are not updated if the query times out before getting the future corresponding to the scan i.e. if it times out at this point.
We only update relevant metrics if we catch a TimeoutException here if the future.get times out here. We should update the metrics in the first case as well.