Merge "MidiManager: Address API Council feedback:" into mnc-dev