Merge "Fix theoretical race condition in addOutputTrack"