Merge "Cleanup DirectOutputThread::mActiveTrack"