(Partial Update) Fix the issue when we have several RenderTasks