Merge pull request #9109 from evelynhung/issue-854609

bug 854609 - clear record before showing connection fail alert, r=arthur(cherry picked from commit 7de2688c60a0b9a20bd43bff8e7cc3577d0d9c1b)

Conflicts:

	apps/settings/js/bluetooth.js
Merge pull request #8767 from jaoo/834103

Bug 834103 - [OPEN_][Call setting]call forwarding icon in status bar doe...(cherry picked from commit cece889827f81fd8ec33cc50e0b9cedbefb4fc85)

Conflicts:
	apps/settings/js/call.js
	apps/settings/js/connectivity.js
Merge pull request #7984 from jaoo/832876

Bug 832876 - [Settings] Call settings - When wrong number is input in fo...(cherry picked from commit 46511e8b0e84b8ae18671fcd34a75ccbdb720ccf)
Merge pull request #7819 from jaoo/823508

Bug 823508 - Indicate progress state when setting Call Forwarding. r=arthurcc(cherry picked from commit 8bff7dfcfcdd7165c605c98c70cf69d5cc8828d2)
Merge pull request #8669 from marcofreda527/bug-848597-proximity-v2

Bug 848597 - The timing of enabling Proximity sensor doesn't consider alerting state. r=timdream, a=tef+
Bug 856991 - Use equals to look up phone numbers in SMS app instead of contains, backport from master r=julienw
Merge pull request #8453 from RudyLu/keyboard/Bug836192-Keyboard_Silent_Mode

Bug 836192 - [Keyboard] Listen to ring.enabled to mute the keyboard clic...
Merge pull request #9040 from jaoo/826537

Bug 826537 - Avoid reentering custom APN settings, r=kaze
Merge pull request #8934 from ian-liu/ril/Bug845629_change_mnc_mcc_type_from_integer_to_string

Bug 845629 - [Gaia] change mcc/mnc type from integer to string. r=kaze(cherry picked from commit 96a236d8a4c47447a4a16be60c1b457d7254acf9)

Conflicts:
	build/settings.py
Merge pull request #9282 from jaoo/863125

Bug 863125 - (REGIONAL) Voice mail number is not configured. r=kaze(cherry picked from commit 40bf6cec698a738493f64bf974663af02c97b094)
Merge pull request #9245 from jaoo/860411

Bug 860411 - Roaming Broker or Double IMSI SIM card, r=kaze(cherry picked from commit 08f2547c34b02fb7920efc4e31e22023ce638873)
Merge pull request #9273 from gasolin/issue-863126

Bug 863126 - (REGIONAL) Internet Setting name under Data Settings is inc...(cherry picked from commit dd857196663096946ffcad89d2596187c375ed77)
Merge pull request #8847 from crdlc/bug-851692

Bug 851692 - clock on homescreen is out of date from when screen turned ...(cherry picked from commit 45506a722460094cd69e8fa419874cf2eb73fa2e)
Bug 862061 - [SMS][MMS] contacts without a phone number entry will break the SMS app r=borja

v1.0.1 adhoc patch
also fixes the contact search that was broken for some time because of an
undeclared variable.

Per request here https://bugzilla.mozilla.org/show_bug.cgi?id=862061#c12

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 857691 - Weird error message showed when checking Call Waiting status. r=arthurcc
(cherry picked from commit cfe6ee1865e5e3025a98d57c941d96cee22f231b)

Conflicts:
	apps/settings/js/call.js
Bug 865161 - [Call log] Creating new contact/Adding to an existing contact error (only v1.0.1) r=arcturus
Bug 863776 - Fix SMS tests caused by Bug 843511 r=borja

* rename the desktop mock to not conflict with the unit test mock
* better cleanup in the sms_test 'unit' test
* moved some of the `ThreadUI` tests that were in `sms_test` to `thread_ui_test`
* stubbed window.history.back in sms_test.js so that we don't leave the
  test-agent
(cherry picked from commit 0cd9bc4755307186d2b05e11d93c463d532d604f)

Conflicts:
	apps/sms/js/message_manager.js
	apps/sms/js/sms_mock.js
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/sms_test.js
Merge pull request #9358 from lodr/bug-864798-change-mnc-mcc-with-strings

Bug 864798 - Follow up of bug 845629 about updating MNC and MCC uses
Cause r+(cherry picked from commit 4461830f907e8f87ff13ddb31aabec4726530306)
Merge pull request #9345 from lodr/bug-864269-reset-low-balance-notification

Bug 864269 - Resetting notification each time the user changes the threshold
Cause r+(cherry picked from commit a49fc93f3d36c34b167a57d1da319ed5e9d0086f)
Merge pull request #9420 from albertopq/contacts-bug-only-org

Bug 864841 - Creating a contact with only "Company" doesn't work r=arcturus(cherry picked from commit e465d99917b72e16e4f6b4f1e7fdce7b84b152f9)