Merge "Remove sourceClip from OutputCompositionState"