Merge "Fix for MidiManager bug" into mnc-dev