Merge "Fix truncated in USB preference" into sc-dev