Merge "Fix NPE of BaseContainerInterface#calculateTaskSizeInternal" into main