Merge "Calculate grid layout size separately from task size" into sc-dev