Merge pull request #14602 from EragonJ/bug-947432

Bug 947432 - [DSDS] Marketplace and Payment indication in Settings
(cherry picked from commit a71f70f131beb6139433ed72b679111da40c0291)
Merge pull request #14501 from gitmai/bug-944718-Broken-usage-widget

Bug 944718 - [Cost Control] Broken access to usage widget from utility t...
r=salva
(cherry picked from commit 3452fbdb5e1bed0cd27cc6173136537a03e8072f)
Merge pull request #14461 from arcturus/bug-946250

Bug 946250 - When settings is invoked from messaging and closed from home button it does not recover its original status
(cherry picked from commit 9ef1819d2b5b3d0db48538b6b4b8a0af0440a3c2)
Merge pull request #14051 from jmcanterafonseca/fb_migration_datastore

Bug 924139 - Devise and implement a mechanism to migrate FB data between...
(cherry picked from commit 0f2768c9a426c7a405b20dac32a2b46b24a747a0)
Bug 947865 -[Cost Control] Settings are broken and unusable

(cherry picked from commit 012f11bc56c949ad9e9df399c57448a8436d1448)
Merge pull request #14527 from gitmai/bug-948304-remove-mindgap-reference

Bug 948304 - [Cost control] Remove reference to mindgap.js library
r=salva
(cherry picked from commit 1be287a4f607a2b6278b7f30e2e148764748e7b6)
Bug 942795 - [email] autoconfig XHR callbacks seem to be firing multiple times on nightly. r=asuth a=fabrice
Merge pull request #14662 from mcav/autoconfig-xhr-1.3

Bug 942795 - [email] autoconfig XHR callbacks seem to be firing multiple times on nightly. r=asuth a=fabrice
Merge pull request #14626 from EragonJ/bug-945140-another-try

Bug 945140 - [DSDS] SIM 2 can still MT/MO SMS and MT voice call in airpl...
(cherry picked from commit f5454b4826b2c36ceb869c8c1f6a339be5db9749)
Merge pull request #14560 from EragonJ/bug-947339

Bug 947339 - [B2G][Settings][Lock Screen] always show create passcode
(cherry picked from commit f185fa84096b7fcac8b111233330f0765fc8941f)
Uplift changes for Bug 925398 (includes Bug 945284, Bug 947001)
Merge pull request #14508 from julienw/942863-use-height-instead-of-border-bottom

Bug 942863 - Workaround for a Gecko bug in SMS app with APZ enabled. r=borja
(cherry picked from commit b44a75862ebcb651381eabc9c3a3b203d76d63bf)
Merge pull request #14614 from Rik/call-screen-banner-multiline-946742

Bug 946742 - Message overlapped during multiparty when a call is released r=etienne
(cherry picked from commit 0ee9b91a5cf770c099ecaeaadf85fec9c493f53d)
Merge pull request #14717 from malini/v1.3

Uplift changes for Bug 925398 (includes Bug 945284, Bug 947001)
Revert "Merge pull request #14717 from malini/v1.3"

This reverts commit 8d2969477c0e1b9ab2ea97a211b3a16df8b3de45, reversing
changes made to 035ecebb6449473f90907292896f1ebdbddf3bf0.
Merge pull request #14733 from malini/v1.3backout

Revert "Merge pull request #14717 from malini/v1.3"
Merge pull request #14339 from huchengtw-moz/video/Bug_945508_bad_playback_layout

Bug 945508 - WebM video with 11:9 aspect ratio has bad playback layout, r=djf
(cherry picked from commit 9a1e5fee6d68d7124ce84ce6b96dc63d73ad9085)
Merge pull request #14734 from huchengtw-moz/video/Bug_945508_v1.3

Merge pull request #14339 from huchengtw-moz/video/Bug_945508_bad_playba...
Bug 937029 - Hardware home button needs to be tapped twice from landscape-secondary mode
Merge pull request #14736 from gasolin/issue-937029

Bug 937029 - Hardware home button needs to be tapped twice from landscape-secondary mode, r=alive