Merge "Fix icon positioning for flexible split in Overview" into main