Merge pull request #8046 from mykmelez/v1-train

bug 839552 - ignore generated file icc.json; r=fabrice, a=akeybl
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 #8019 from crdlc/bug-835794

Bug 835794 - [E.me UX] [Activity Indicator] Wrong use of spinner when lo...(cherry picked from commit 4f32fca6f68ed703cb6f3a5d6d3e185fa0a25206)
Merge pull request #8018 from steveck-chung/email-activity-indicator

Bug 835410 - [Email UX] Wrong use of spinner when sending an email. r=asuth(cherry picked from commit 5d1eeacb59dbd315f7fa8337c4e73d16fde67c33)
Merge pull request #8014 from KevinGrandon/bug_838871_backout_bug_808650

Bug 838871 - Revert "Bug 808650 - Implement filtering by contact email."(cherry picked from commit 60b6cbfa0a2ff540c1d6ededd5d3a82c85827d65)
Merge pull request #8023 from lodr/bug-832904-no-end-date

Bug 832904 - Hiding billing period when this is set to "never"
Cause r+(cherry picked from commit 6ca4cd371d3452245a633fe7a6a12bcc954c3272)
Merge pull request #7918 from KevinGrandon/bug_836371_simplify_dom

Bug 836371 simplify dialer keypad dom [r=etienne](cherry picked from commit 7a6e38f99271cce2caef79a27cb0f93cd51b240e)
Bug 839068 - app install manager doesn't handle the uninstall of an app r=etienne

Correctly handle the uninstall event in the app install manager. Remove the
notification and the download icon if they're displayed too.
(cherry picked from commit 9157646edfa2065d098c3c0bd4b5cf270a84c9fa)
Merge pull request #8009 from albertopq/issue-834648

Bug 834648 - Contact details. Layout's spacing needs to be adjusted r=basiclines(cherry picked from commit ad5bf1cdd8025f929ad6e124d10973e29eda5b0d)
Merge pull request #8029 from alivedise/bugzilla/838710/off-origin-app

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