Merge "Fix overlapping group editors"