Merge "Remove stack-based grouping in SF rects view." into main