Merge "Only log excessive timeouts if those appear accidental"