Merge "Explicitly rebind to a transport after timeout"