Bug 957714 - [Messages] Interacting with message field prevents recipients field from stealing focus (cursor jump) r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=957714
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #15727 from gtorodelvalle/contacts-bug-962989-message-to-Facebook-contact

Bug 962989 - [messages] sending message to a Facebook contact doesn't work (r=jmcanterafonseca)
(cherry picked from commit f856ac26063e5462efad3cf13a46b35c6686af5b)

Conflicts:
	build/jshint/xfail.list
Merge pull request #14578 from gitmai/bug-948824-CC-remove-icchelper

Bug 948824 - [CostControl] [DSDS] Remove IccHelper
r=salva
(cherry picked from commit 33e4a0f4e242b54c91eb8a1f5f91efada5252565)
Merge pull request #15654 from jaoo/962453

Bug 962453 - [DSDS] Once visit APN setting of one SIM, same APN of another SIM will be changed to "Custom". r=arthurcc(cherry picked from commit 4d0b2ffaf044a20b5bea9d7d85d4ecc5a71080fd)

Conflicts:
	apps/settings/elements/carrier_data_settings.html
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/elements/carrier_supl_settings.html
Bug 963173 - Ensure address bar is always displayed when a different tab is selected. r=daleharvey
(cherry picked from commit ac0692fcd9bc59508dc978591cc380f8dcdc7873)
Merge pull request #15815 from davidflanagan/bug956811

Bug 956811: ugly workaround that abuses the settings db for interapp communication r=jporter(cherry picked from commit 2c64a463f6bb053a05326ee1b6c5236eb31b898c)
Merge pull request #15873 from davidflanagan/bug956811-v1.3

Merge pull request #15815 from davidflanagan/bug956811
Merge pull request #14547 from davidflanagan/bug946519-v1.2

Bug 944276: MMS workaround for problem with memory-backed blobs r=julienw(cherry picked from commit bd559ee748be267a80fff2bbdbd887c85af06eba)

add global comment to keep jshint happy
Merge pull request #15820 from davidflanagan/bug944276

Merge pull request #14547 from davidflanagan/bug946519-v1.2 r=julienw
Merge pull request #15872 from gabrielesvelto/bug-960507

Bug 960507 - Properly remove the onheld event handler when doing a second call r=etienne
(cherry picked from commit 905a2aa679f6d2ed075d9414ed8f6b35f22153ee)
Merge pull request #15711 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 961938 - [DSDS][MMS] Switching data confirmation message will pop up twice r=julien
(cherry picked from commit 9497e89bbf6060d1a837a7ccbf396f8c359eb13b)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Merge pull request #15874 from Rik/simslot-965155

Bug 965155 - SIM manager will set all outgoing settings to SIM 2 after r... r=etienne
(cherry picked from commit 0cb3631191ef12947e981c0ff35e9d27256972cf)
Bug 957709 - Patch to prevent Camera/Gallery switch buttons from being hammered.

Update patch for 957709 after djf's review.

Updated PR 15845 following review.