Merge "Do not try to unbind if not connected"