Merge "Update the USB device filter to support interface name" into main