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)
Merge pull request #9418 from jlebar/sms-keep-alive

Bug 865429 - Hold the high-priority wake lock before showing the new-SMS...(cherry picked from commit c6b17d0000c43f7bdf3f46f96a4e9af3bc16c0d8)
Merge pull request #8577 from EverythingMe/clientinfo-api

[Bug 849793] pass clientInfo in POST data instead of cookie [r=crdlc](cherry picked from commit b396d31b96e29518322748de188bee5020131560)

Conflicts:
	apps/homescreen/everything.me/js/api/DoATAPI.js
Bug 863127 - Dont show SPN if same as network name, r=@timdream, a=tef+
uplift
Bug 852468 - [Gallery/Camera] Gallery is shown deleted files after deleting from “Video shot list", r=djf, a=tef+
Merge pull request #9372 from RudyLu/contacts/Bug854814_label_localization

Bug 854814 - correctly localize the labels of each field in contacts. r=albertopq(cherry picked from commit b23c5dbe6e6b53ba802fbb714667fc13e32f666c)
Merge pull request #9170 from jmcanterafonseca/fix_trim

Bug 861707 - TypeError: contact.givenName[0].trim is not a function(cherry picked from commit 5169151672faa4040a4ad815667a519d8e631f07)
(cherry picked from commit 39416748d3ff5a9fc8127b141c5ea820249e12c6)
Merge pull request #8967 from mcirlanaru/bug_835972

Bug 835972 - Display SIM PIN dialog (if SIM card locked) for apps that ...(cherry picked from commit b126eeb39ed9bfa1e5662386f74611d5d6527b18)

Conflicts:

	apps/system/js/sim_lock.js
(cherry picked from commit 30620a3a7aff89b603a73a0265b668479955aa50)
Merge pull request #9186 from mcirlanaru/bug_861206

Bug 861206 - Don't prompt for SIM PIN entry if Settings app is opened(cherry picked from commit 9944dd8671c305a0be62d9cef918e022e5184ac0)
Merge pull request #9446 from comoyo/863127_1.0.1

Bug 863127 - Dont show SPN if same as network name, r=@timdream, a=tef+
Bug 865125 - [sms] The user can still enter characters in the input while the alert is shown, even when it's supposed to be full r=borja
(cherry picked from commit b742c91a1629d90067af454c4bef1e7480cc67d5)
Merge pull request #9216 from davidflanagan/bug861965

Bug 861965 - remove idle time during metadata parsing and prevent zooming while scanning large images r=gal(cherry picked from commit 3463dc01096e5423be6d08dc2f71f62c12ffbb45)
Merge pull request #9442 from EverythingMe/bugfix-add-to-homescreen-multiple

[Bug 866502] Only allow apps to be added to homescreen once [r=crdlc](cherry picked from commit 8050f595ff501eba45daeadb158e69ce80c83fa6)
Bug 867064 - Fix homescreen panning test due r=crdlc a=npotb

Move from mouse events to touch events.
Send both event types so that we won't fail in some situations.

also mock requestAnimationFrame in the suiteSetup instead of setup.
(cherry picked from commit f317b4afa829448177bdac9a00248eff10cf572e)

Conflicts:
	apps/homescreen/test/unit/grid_test.js
Bug 843877 - Remove facebook.com UA override r=fabrice
(cherry picked from commit f8b39ac058ce0a73006805df81455d101d971901)