Merge pull request #18026 from acperez/bug-912445

Bug 912445 - Show specific information when there is a server connection issue with an application.
Revert "Merge pull request #18308 from cctuan/968661-3"

This reverts commit 5888971a38db832241e0cf40e4f9d5e32333db51, reversing
changes made to 76c94ac5dc3b8e17cc23d9cc3e2662b0d5d28b2e.

see https://bugzilla.mozilla.org/show_bug.cgi?id=968661#c35
Bug 995101 - Don't use nfc-hardware-state-change event. r=alive
Merge pull request #18411 from zacc/bug_997633

Bug 997633 - Update Python marionette_client to 0.7.6
Merge pull request #17073 from zacc/bug_979914

Bug 997673 - Refactor of cost control python tests
Bug 993832 - wrong multi-res resource file name
Merge pull request #18449 from gasolin/issue-993832

Bug 993832 - wrong multi-res resource file name, r=yurenju
Bug 968695 - [settings] add marionette test for Application storage panel
Bug 992233 - 984153 regressed the background color for suggestions list
Bug 997064: Do not call navigator.mozFMRadio from system app.
Bug 991446 - Fix coverage when tests are run in their own sandbox
Merge pull request #18313 from allstarschh/Bug995101

Bug 995101 - NFC: Don't use nfc-hardware-state-change event to enable/disable NFC. r=alive
Bug 988711 - [Messages] There is a Settings entry in each single message. r=julien,zac
Merge pull request #18363 from steveck-chung/bug-992233

Bug 992233 - 984153 regressed the background color for suggestions list. r=julienw
Merge pull request #18430 from hfiguiere/bug987383-2

Bug 987383 - Make sure to deal with empty output so that JSON stay valid r=julienw
Revert "Merge pull request #18449 from gasolin/issue-993832"

This reverts commit 9ce3fa58b57c5665a99dce2003e7b03a0b284770, reversing
changes made to a79a34f8114f5804f363685d717734c383f0d8ab.
Merge pull request #18409 from RickyChien/bug-991446

Bug 991446 - Fix coverage when tests are run in their own sandbox r=@yurenju
Merge pull request #18175 from azasypkin/bug-988711-settings-entry

Bug 988711 - [Messages] There is a Settings entry in each single message.
Bug 997680 - Show a google search link if exists in e.me results. r=kgrandon
Merge pull request #18432 from zbraniecki/995425-upgrade-sinon

Bug 995425 - upgrade sinon to 1.9.1 and update API usage. r=julienw