Merge "MidiFile uses C++ Thread not createThreadEtc"