Merge "Temporarily disable active task trimming."