Merge "Reduce unnecessary invocation of fillTaskInfo" into main