Merge "Fix ServiceConnector failing unbind if not connected." into tm-dev