Bug 988445 - [AirplaneModeHelper] getStatus method does not return rightly

Conflicts:
	apps/costcontrol/js/app.js
	apps/costcontrol/js/widget.js
Merge pull request #17839 from cvan/updated-mkt

Bug 989470 - Fix MCC/MNC dual SIM detection in Marketplace app
r=julien
(cherry picked from commit 5d81c713215ee1b97996e0bedff87dcd14309eec)
Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps

Bug 987458 - [B2G][Calendar] Only one alarm will fire and only one notif...
Conflicts:
	apps/calendar/js/notification.js
	apps/calendar/test/marionette/alarm_test.js
Bug 989852 - [Sora][STK]'OK ' item is grayed when execute 'Get input' with a default text and user input command., r=vingtetun
Bug 994630 - [1.4] Fix failure in test_receive_active_sync_email.py
Merge pull request #18169 from viorelaioia/bug_994630

Bug 994630 - [1.4] Fix failure in test_receive_active_sync_email.py
Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
Bug 975535 - E.me followups [r=ranbena]
Merge pull request #18068 from julienw/989470-v14-marketplace-package

Merge pull request #17839 from cvan/updated-mkt
Bug 975343 - Show multiple phone numbers and iccids on dual sim devices
Merge pull request #17997 from mikehenrty/bug-988737-clear

Bug 988737 - SMS notifications do not clear when launching SMS app after... r=alive
Merge pull request #18162 from mikehenrty/bug-987458-1.4rebase

Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps
Bug 994644 - [master] test_that_device_info_is_populated in failing on CI
Merge pull request #18229 from viorelaioia/bug_994644_v1.4

Bug 994644 - [master] test_that_device_info_is_populated in failing on C...
Revert "Merge pull request #17997 from mikehenrty/bug-988737-clear"

This reverts commit 32af2759f67252fa490d1f36f912b73a33481965.
Merge pull request #17207 from JerryShih/bug-974807-handle-lost-context-in-gallery-redo-when-lose-master

Bug 989847 - Handle webgl context lose/restore event for gallery editor mode r=djf(cherry picked from commit a55eb67d0659327a8e4b64099fc76a634823fecd)
Merge pull request #18240 from davidflanagan/bug989847-v1.4

Merge pull request #17207 from JerryShih/bug-974807-handle-lost-context-...
Merge pull request #18081 from frsela/STK/Bug989852_v1.4

Bug 989852 - [Sora][STK]'OK ' item is grayed when execute 'Get input' with a default text and user input command., r=vingtetun
Merge pull request #18004 from EverythingMe/992644-console-binding

Bug 992644 - EverythingME.log: Bind to window.console object [r=ranbena]
Merge pull request #17986 from lissyx/bug992129

Bug 992129 - Generate voicemail notifications that are DSDS compliants r=etienne_s