Merge "MIDI: API changes to support multiple ports per device"