Merge "Fix a dead lock for SubtitleTrack"