Merge "add usb namespace to the mapping list" into main