Merge "Revert "Usb Passthrough: Enable usb passthrough on master""