Merge "MidiService: Fix some concurrency problems"