Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
Bug 975535 - E.me followups [r=ranbena]
Merge pull request #17956 from DouglasSherk/965854-voicemail-sim-indicator

Bug 965854 - [DSDS][System] Display SIM indication in voicemail notification. r=etienne
Conflicts:
	apps/system/index.html
Merge pull request #18462 from justindarc/bug993686

Bug 993686 - [B2G][Camera] - Tapping repeatedly on capture button while ...
Merge branch 'v1.4-bug-975535-homescreen' of github.com:samjoch/gaia into samjoch-v1.4-bug-975535-homescreen

Conflicts:
	external-apps/marketplace.firefox.com/application.zip
Merge pull request #17762 from gabrielesvelto/bug-989357-recompress-application-icons

Bug 989357 - Recompressed the new application icons r=crdlc,ran
Merge pull request #18075 from lissyx/bug989876

Bug 989876 - Setting installTime and updateTime fields r=yurenju
Bug 1000059 - smoketest= tag is missing from some manifest files
Bug 1000176 - [v1.4] Investigate and fix failure in test_sms_with_attachments
Merge pull request #18590 from viorelaioia/bug_1000176

Bug 1000176 - [v1.4] Investigate and fix failure in test_sms_with_attach...
Merge pull request #18347 from mcav/acctsslice

Bug 966323 - [B2G] Email account unrecognizable when sharing a link from... r=asuth
Merge pull request #18296 from mcav/email-toolbar

Bug 993215 - [Email] toolbar covers the bottom line of long emails. r=jrburke
Merge pull request #18445 from chuck-lee/bug-997791_Gaia_ui_test_error_on_wifi_enable_disable

Bug 997791 - Simulate echo setting to "wifi.enabled" from system app. r=arthurcc
Bug 992948 - Use the telephony-call-ended sysmsg to record calls in the calllog
in order to remove a callscreen->appwindow dependency.

Conflicts:
	apps/communications/dialer/test/unit/dialer_test.js
Revert "Bug 992948 - Use the telephony-call-ended sysmsg to record calls in the calllog"

This reverts commit 28716364c7a9e43e6911c74e3f80ab37af0422b7.
Bug 993273 - Ensure FxA dialog is created hidden
Revert "Merge pull request #18445 from chuck-lee/bug-997791_Gaia_ui_test_error_on_wifi_enable_disable"

This reverts commit 0a299a0f0ef33ed1dce7eb50ab900855b4d8369a.
Merge pull request #18528 from jaoo/998914

Bug 998914 - [Settings] Cannot preselect the APN correctly if there are several APNs with the same carrier name (follow-up bug 991628). r=arthurcc
Merge pull request #18660 from timdream/fix-trust-ui-fxa-1.4

Bug 993273 - Ensure FxA dialog is created hidden +shepherd
Bug 995605 - [Sora][Message][MMS]Can't add the text in content when forward a media MMS r=schung

The issue is that in compose.js, "pointer-events: none" is added after it's
removed, in this case.

This patch ensures that SMIL.parse always calls the callback in an asynchronous way,
so that the caller does not have any surprise.