Merge "Update pivots after taskSize is updated" into main