Revert "Bug 961047 - Remove some dead code in Gaia with APZC enabled by default from the platform. r=alive,fabrice"

This reverts commit ffd4a72a6031461fe56cc16c89ca480a0efc1383.
Re-land "Bug 961047 - Remove some dead code in Gaia with APZC enabled by default from the platform. r=alive,fabrice"

This reverts commit cd0647684b057a9a8d02b362fa72fa41aa70bacf.
Merge pull request #15581 from jrburke/bug962257-email-link-blank

Bug 962257 - [B2G][Email][Browser] Link navigates to blank screen when s... r=asuth
(cherry picked from commit f705458617f6837aca38c1b7a7194210cfc1657f)
Merge pull request #15634 from gregorwagner/ftu

Bug 945552 - [FTU] network selection - refresh button remains selected. r=francisco
(cherry picked from commit 19997fb17584649e1e072b31637567a8add3d78b)
Bug 958939 - [OTA][Helix] The items added in home screen are missing when device updates from v1.2 to v1.3

(cherry picked from commit 93bea008761b534d8337f7819fc16ba526f686d2)
Merge pull request #15638 from crh0716/961746

Bug 961746 - Passing the correct parameter to showIfLocked r=alive
(cherry picked from commit b70d0d0baa83b0f026bcb3c2651a64f96785c65e)
Merge pull request #15401 from crh0716/930108

Bug 930108 - Adjust padding r=evelyn
(cherry picked from commit 01fa20c3bcc200830f162d0d95a91e54b183c021)
Merge pull request #15592 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 961942 - [DSDS][MMS] Switch data connection confirmation message contains strings failed to be localized. r=@crh0716
(cherry picked from commit e264fd78890aa58a0b70778071f2277c712cfbda)
Merge pull request #15664 from jimporter/music-usb-pick

Bug 943750 - Music app will not show files in pick mode if device is shared using USB and then unplugged
(cherry picked from commit 79346c6ad8d29c1aa338845f9e56466364c33343)
Merge pull request #15681 from julienw/959422-fix-crashing-canvases

Bug 959422 - [Messages] The Messages app crashes when attaching too big images
(cherry picked from commit 177e4c8c6459d8b85a840354c27e0d3b37ee4329)
Merge pull request #15598 from etiennesegonzac/bug-959914-dsds-emergency-call

Bug 959914 - Always dialEmergency from the first service when there are no sim cards.
r=rik
(cherry picked from commit 1720aab5d5697e9c77029f15cff6ae343809c228)
Bug 961569 - Fix modal dialog under mozfullscreen

Conflicts:
	apps/system/style/window.css
Merge pull request #15674 from alivedise/bugzilla/961569_v1.3/fullscreen-modal-dialog

Bug 961569 - Fix modal dialog under mozfullscreen, r=timdream, a=1.3+