Merge "Remove InvokeData and add ContextFinish to generate a sync point."