Merge "Fixing 'No data transfer' mode in USB configuration"