Merge "Revert "Unbind ConnectionService if connection creation timed out."" into main