Merge "Avoid connecting the device again when the device is already connected" into sc-v2-dev