[Bug 879582] Returned Evme shortcuts scrollbar

(cherry picked from commit a137fc19ed8757f7451c872b3c4b839d4f46a8bd)
Merge pull request #10597 from crdlc/bug-883142

Bug 883142 - The task switchers cross sometimes does not work
(cherry picked from commit 4333e735e7a9804855008b92ed35a5be92148699)
Merge pull request #10574 from frsela/STK/Bug886286

Bug 886286 - [STK] Move non-managed STK commands to system
(cherry picked from commit 4563b1e4ef7fe2a8d860995aadd29c439c9546a7)
Merge pull request #10569 from frsela/STK/Bug880339

Bug 880339 - [STK] "STK_CMD_SET_UP_CALL" code refactoring
(cherry picked from commit e9dbb1134dd833a38cc969bf58c9952d45d8f615)
Bug 883787 - Translate the code in HTML comments in the build process

(cherry picked from commit 53eea8a3da5ae1de3de471a0b1d48aafdd7e81ce)
Merge pull request #10570 from frsela/STK/Bug880346

Bug 880346 - [STK] "STK_CMD_SEND_SMS" code refactoring
(cherry picked from commit 60d6c87ff85bec4ceb70470fc310088db2de3bd7)
Merge pull request #10571 from frsela/STK/Bug880351

Bug 880351 - [STK] "STK_CMD_PLAY_TONE" code refactoring, r=timdream
(cherry picked from commit 2a79044b1cb58b1b51e3e7543c187268f4725a06)
STK_CMD_SET_UP_EVENT_LIST moved to system

(cherry picked from commit 7ad123ab2f7d0282ea78336162f09080332d4273)
Revert "Bug 883787 - Translate the code in HTML comments in the build process"

This reverts commit b2b19ae237adecbc91faf99c6f0372110ad7f44e.
Bug 883787 - Translate the code in HTML comments in the build process

(cherry picked from commit 53eea8a3da5ae1de3de471a0b1d48aafdd7e81ce)
(cherry picked from commit b2b19ae237adecbc91faf99c6f0372110ad7f44e)
Bug 852321: Update xulrunner SDK to reduce download time. r=ochameau
(cherry picked from commit f7fffb5bf8caa8170f3a0d821ab1f7a195a244c0)
Bug 881248 - [MMS] Multirecipient. A contact with >1 number must only render the relevant number (vs. rendering all) r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 6406b9a535b5fcd7143a6ccb58c03a3a7b4296c5)

Conflicts:
	apps/sms/test/unit/mock_utils.js
Bug 840038 - [MMS][User Story] Image rescaling to 300kB(Apply to composer attachment) - r=gnarf

Adds resizing step in Composer
Adds a resizing notification
Adds Composer.isResizing
Only show file too large error when not an image
Refactors getting mmsSizeLimitation
Defaults to 300k for mmsSizeLimitation
Adds "resize-image" locale string
Adds number: 1 to pick action

Closes gh-9854
(cherry picked from commit dea31788f6da0abcd9e6d83f7dbf26b89c6f8063)

Conflicts:
	apps/sms/manifest.webapp
Merge pull request #10321 from borjasalguero/message_activity_proposal

Bug 880115 - [SMS / MMS] Activity handling does nothing when triggering ...(cherry picked from commit 5026dfab780b3d5205d419b9979baeebcd12bf73)
Bug 814840 - Isolate FTU Launcher from Window Manager

Conflicts:
	apps/system/index.html
	apps/system/js/window_manager.js
	apps/system/style/system/system.css
	apps/system/test/unit/captive_portal_test.js
Merge pull request #10590 from oconnore/879203-homescreen-opacity

Bug 879203 - opacity transition in home screen is not smooth r=crdlc(cherry picked from commit d45b4889fa5ba6dc6400aedf1310521d5d09948b)

Conflicts:
	apps/homescreen/js/grid.js
Revert "Bug 854842 - Check FTU running before visibility change"

This reverts commit ee55b12d8bf8fcfc49f271e7f4a1086f47eeea96.
Because we are uplifting bug 814840 to v1-train.
Revert "Bug 875646 - Bypass FTU sim lock checking"

This reverts commit 5af655da5ba0bc48d4c69a0b668112321f1dd6be.
Because we're uplifting bug 814840 to v1-train.

Conflicts:
	apps/system/js/sim_lock.js
	apps/system/js/window_manager.js
Revert "Bug 831697 - White screen after receive a call in FTE"

This reverts commit 0106127dff01dc98d90ad394cc69fd0d67cd2230.
Because we're uplifting bug 814840 to v1-train.
Uplifting 814840 - resolve conflict of bug 875646, reverting
aa166a4f3c03917d208a347fe96303fcad58f0fa