Merge "Faster sniffing for MIDIExtractor"