Merge "Fix regression in task trimming"