Merge "MidiService: fix resource leak" into nyc-dev