Merge "Re-enable task trimming"