Merge "Isolate references to outputTracks/mOutputTracks"