Merge "Clip transition animations within a task to the task"