Merge "Improve rects grouping." into main