Merge "Refactor out rebindIfDisconnected" into main