Merge "PointerIcon: Treat 0 as a valid type index for system icons" into main