Merge "Fix and test usb function configuration change" into sc-dev