Merge pull request #11160 from timdream/fix-icon-selection-dppx

Bug 883819 - Use 90@1x icon as 60@1.5x icon for now, r=crdlc