Merge pull request #7547 from crdlc/bug-829050

Bug 829050 - Add a config preference to allow disabling of e.me altogeth...(cherry picked from commit 050df3e9e0cfd0aa83a78485bb180e8b9c701e2c)
Merge pull request #8029 from alivedise/bugzilla/838710/off-origin-app

Bug 838710 - Off origin app(cherry picked from commit b570d21992fb3745fdf61c8d12da028d3ec9f077)