Merge "PointerIcon: Add leniency to hotspot validation for scaled icons" into main