Merge "Fix Settings usb preference search" into sc-dev