[ros-diffs] [zguo] 65091: [WIN32SS] Fix icon selection regression caused by cascading fix. In this case, this should probably go into trunk. CORE-8574