Merge pull request #9597 from ochameau/browser-helper

Bug 869540 - Split desktop-helper to segregate browser related feature out of it. r=@vingtetun(cherry picked from commit 93ecda33fac3349b8a7bbf80e5c16a01393a1be9)