LegacyUSB: Squashed commit with updates for 4.2