Bug 920752 - Make origin more flexible to fix browser case
Bug 936185 - [Settings] Move shims into desktop helper.
Merge pull request #12456 from KevinGrandon/bug_920752_contacts_gmail_browser_import

Bug 920752 - Make origin more flexible to fix browser case r=arcturus
Revert "Bug 920752 - Make origin more flexible to fix browser case"

This reverts commit 29ffb50a702bfc61906ee9599a7b41b2b6505d25.
Merge pull request #13486 from KevinGrandon/settings_desktop_shims

Bug 936185 - [Settings] Move shims into desktop helper r=evelyn
Bug 937103: Removed the condition placed bt Bug 818287