[ros-diffs] [dquintana] 65695: [SHELL32] * Revert r65589, since it breaks tray icons.