Bug 936185 - [Settings] Move shims into desktop helper.
Merge pull request #13486 from KevinGrandon/settings_desktop_shims

Bug 936185 - [Settings] Move shims into desktop helper r=evelyn