Bug 993273 - Ensure FxA dialog is created hidden
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.
Merge pull request #18602 from jimporter/music-update-hidden-scrubber

Bug 1000214 - [music] Update progress bar when display is suspended and ...
Conflicts:
	apps/music/test/marionette/Player_test.js
Bug 997578 - [1.4] Answer incoming call after hanging up active call, a=1.4+
Merge pull request #18698 from nullaus/bug999511

bug 999511(cherry picked from commit 725a23802708eb70e3d7e8a2ce7179adbac806e4)
Merge pull request #18761 from nullaus/v1.4

Merge pull request #18698 from nullaus/bug999511
Merge pull request #18639 from crdlc/bug-1000454

Bug 1000454 - [B2G][1.4][Gaia]: The timestamp for a file downloaded a we...
Merge pull request #18727 from bentian/bug-997578-14

Bug 997578 - [1.4] Answer incoming call after hanging up active call, r=etienne, a=1.4+
Bug 995187 - [1.4]Call log is not showing the full phone number
Revert "Bug 995187 - [1.4]Call log is not showing the full phone number"

This reverts commit 92f26016de320e09a9baa7477e61ccde89908591.
Merge pull request #18718 from azasypkin/bug-995350-save-button

Bug 995350 - [SMS] - Display Save button for attached image file name having hidden directories ".gallery/". r=julien
Bug 988670 - [Camera][Madai] Behavior when leaving camera while in preview mode and hitting home button needs to be reconsidered
Bug 965486 - [Camera] Build time configuration system

It allows to specify an external js/config/app.js file.
The file is copied over the original one in the repo
Merge pull request #18799 from justindarc/bug988670-v1.4

Bug 988670 - [Camera][Madai] Behavior when leaving camera while in previ...
Roll up v1.4 branch commit for bug email bugs 838843, 882917, 796474

Bug 838843 - [email] email search does not update as headers are modified or deleted, allows user to still see and fail to display deleted messages. r=mcav
land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/296

Bug 882917 - [email] "Body" search of HTML messages regressed by worker thread migration. r=mcav
land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/297

Bug 796474 - [email] quasi-infinite scroll may hitch under OMTC; consider using absolute positioning with virtual coordinate space r=asuth
Merge pull request #18808 from jrburke/bug796474-v1.4-email-virtual-scroll-slim

Roll up v1.4 branch commit for bug email bugs 838843, 882917, 796474 a=doliver
Bug 983070 - [Message][UI Test] The received message should not causes message thread to open in the thread list view.

uplift from master
Merge pull request #18580 from etiennesegonzac/bug-997701-tone-player-channel

Bug 997701 - Set TonePlayer's channel when creating the audi element. r=gsvelto, rik
(cherry picked from commit 3617fa6b6e5e2e3c7a198227d27a12bca830ff0a)