Merge "Fix issue with grouped task rects being calculated slightly off" into sc-v2-dev