Merge "UsbMidiDevice: Clean up terminology and fix comments"