Merge "Handle isUsbDataSignalingEnabledForUser PO case" into sc-dev