Bug 874459 - Set a valid window icon for desktop on Mac; r=myk, a=leo+

--HG--
extra : amend_source : 0870d9e177c885466556bb04225b374c777a2e30