Merge branch 'fix-overlay-icon-windows' into release-3.14

Merge-request: !3217