Bug 863335 - Download Update via data screen update
(cherry picked from commit e69553c36894979e0be587fe2b172a8b6795d803)

Conflicts:

	apps/system/style/update_manager/update_manager.css
	shared/style/confirm.css
Bug 844900 - Replace SMS "Desktop Mock" with mozSms mock

Mock out the native mozSms API in environments where it is not defined
(e.g. FireFox and B2G-desktop). This promotes code re-use across
environments. This work introduces message deletion in desktop
environments by mocking `mozSms.delete`.

Reference global variables to enable optional control of simulation
behavior.

Update the application's usage of the mocked `SMSRequest` object to
properly reference the `error.name` property defined on `DomRequest`
objects.

r=julienw
(cherry picked from commit ae2a435a39e7cb35a63f73edcfa4b4cbcf0ab1dd)

note from uplifted: Also took the part of Bug 859662 that was not uplifted
because this one was not uplifted.

Conflicts:
	apps/sms/js/contacts.js
	apps/sms/js/message_manager.js
	apps/sms/js/thread_ui.js
Merge pull request #9174 from comoyo/fix_sms_mock

Bug 861814 - Fix the SMS Mock. r=arcturus(cherry picked from commit 074e681c3743503f7170c2ac1c604ede73ac497d)
a=npotb
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)
Merge pull request #9281 from borjasalguero/ww_new_layout_implementation

Bug 860680 - [SMS][MMS] Include new layout in SMS/MMS App r=julienw(cherry picked from commit 60cdc0740438986c4fe502eb9c0822ce14248ef7)
Merge pull request #9384 from gnarf37/sms-test-real-html

[865287] Use real index.html for sms_test(cherry picked from commit e150fb80302bebef676cf0e972bd17f83de97993)
Bug 865355 - [MMS] Switch mozSms with mozMobileMessage r=julien
(cherry picked from commit 20e4b6dd1c18eb0a3b3a37f6b2fb6b5bdb6aec51)
Merge pull request #8254 from steveck-chung/MMS_resize_utility

Bug 840038 - [MMS][User Story] Image rescaling to 300kB. r=borjasalguero(cherry picked from commit 16bb4eb76b240a3f5f7e080bdc1864e0f6148729)

Conflicts:
	apps/sms/js/utils.js
Merge pull request #8673 from timdream/fix-mock-fb-utf8

Bug 851476 - Fix encoding of mock_fb.js(cherry picked from commit 8accbbb49b1b67fd7b93194e07e6bf017e0c90c3)
Merge pull request #9413 from comoyo/fix_sdcard_tests

Bug 862742 - Fix lint and unit tests errors for sdcard import r=francisco.jordano(cherry picked from commit a75b3731696570c2851522758dd1653fcaebcb96)
Merge pull request #9410 from gnarf37/845173

Bug 845173 - [MMS][Utility] Convert HTML element to mms SMIL and vise versa. r=julien(cherry picked from commit ab0d1173cb6d3eb98b7a75e4d1feaa1846216612)

Conflicts:
	apps/sms/test/unit/utils_test.js
Merge pull request #9489 from gnarf37/840059-image-preview

Part 1: Bug 840059 - [MMS][User Story] Photo display from message(cherry picked from commit 1ab9bc88799b4af10fef8a810570e23402934bb3)
Merge pull request #9471 from asutherland/email-4k-fix

Bug 864867 - Keep track of partially fetched bytes now that we attempt larger or complete download of bodies r=asuth.(cherry picked from commit 5944dfb3fb724755fde23d6cccb0f1bfa218e065)
Merge pull request #9494 from gnarf37/840056-audio-preview

Part 1 - [WIP] Bug 840056 - [MMS][User Story] Audio playback from message(cherry picked from commit 50b73f78ed93496039039d9af64cdc6dba9803c2)
Merge pull request #9518 from jrburke/bug868141-double-new

Bug 868141: email: only insert new account card once r=asuth(cherry picked from commit bb459a90a9395ec4f6862ff72f87d17d50602876)
Merge pull request #9426 from evanxd/bug-855814

Bug 855814 - Calendar: Notification: Tapping doesn't always launch app and show event.(cherry picked from commit c580c47da1f7cc421c7aa586b177f7dab881baae)
Merge pull request #9537 from alivedise/bugzilla/862643/psensor

Bug 862643 - Ignore proximity sensor event when headphone plugged. r=timdream, a=blocking-b2g:tef+(cherry picked from commit bd06876916e58115ac7605bbcb6363aa4606491b)
Bug 858362 - [SMS] Received SMS with 'and 1 other' as Contact name. r=julien.

Rename the function rename 'getPhoneDetails' to 'getContactDetails'.
getContactDetails can handle one or multiple contact entry and return the detail information about the contact/contact list.
We utilize it in thread list/thread title, thread view header and contact search result.
(cherry picked from commit 6e0c18857f6d03b47f18caeb78c271c104c60162)
Bug 840076 - MMS download options. r=crh0716.

Reopen the mms panel in settings, and add mms download option selector.
(cherry picked from commit 149ce6309d561777b82a712023ffb4196f9cf701)
Bug 856542: don't process metadata and play videos at the same time r=dkuo(cherry picked from commit cf932ff85b56f46c55fa89be46d6a1168075aab4)