Merge "Use only the icon size for surface to draw the icon into" into main