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