Bug 949044 - App dimensions is not correctly resize after minimizing the call screen
Merge pull request #15164 from changm/bug957913

Bug 957913 Async Load submodules of connectivity. r+ :kaze
Bug 909877 - Enable APZ for all of gaia. rs=milan

(cherry picked from commit 969448b53a9148e58880f64c7a12425ddef99dda)
Merge pull request #14224 from flodolo/separate_header

Bug 944749 - [Settings][l12y] Use different labels for menu items and headers, r=kaze
(cherry picked from commit 588a3e02c4ace3b3341ba1f6bb7274120b53b2b3)

Removed change to apps/settings/elements/improve_browser_os.html which is going to be fixed by Bug 950171 (originally follow-up of this bug)

Conflicts:
	apps/settings/elements/downloads.html
	apps/settings/locales/settings.en-US.properties

(cherry picked from commit d256a30ef3fbdf8d70cfff2c12926df2ab9bf903)
Merge pull request #14884 from flodolo/bug950171

Bug 950171 - [settings] "Improve Firefox OS" title displayed as "Improve {{brandShortName}}"
(cherry picked from commit b3baaadf40db67d8e5812de7a7bb0cdea26844b1)

(cherry picked from commit 1a5b5d779c5482124b4887cc40c7b853fcd4759a)
Merge pull request #14182 from gtorodelvalle/contacts-bug-936250-facebook-sync

Bug 936250 - [B2G][Contacts] Canceling FB sync results in the contacts app being unresponsive.
(cherry picked from commit 6e59c3cd7a793303695521e387c9ce09c2ecb7aa)
Merge pull request #14699 from evelynhung/issue-943317

Bug 943317 - add a timer for expiring disableTap, r=crdlc
(cherry picked from commit ac50e4c9a720db2d5da97ab86f7e962dd2c4c576)
Merge pull request #14494 from chuck-lee/bug-947826_update_wap_push_app

Bug 947826 - Update dataLength to data.length. r=gsvelto
(cherry picked from commit 7e8b532adaa3919d3170313a183a4b1f754c6983)
Merge pull request #14897 from gtorodelvalle/contacts-bug-952455-export-to-bluetooth

Bug 952455 - [Contacts][Bluetooth] "Export to Bluetooth" message blocks the Contacts app and leaves it unusable
(cherry picked from commit b6e92db09234c24644cd348c7e9244daf293a2f2)
Merge pull request #15045 from steveck-chung/bug-941852

Bug 941852 - [B2G]Long pressing MMS attachments will cause alternate message to appear and overlap. r=julienw, a=blocking-b2g 1.3+
(cherry picked from commit dfd7958910ee1e70f72d140e250c25cd7ea286f8)
Merge pull request #15066 from jaoo/951436

Bug 951436 - [B2G][WAP Push][Notification][Settings] APN settings are not stored in settings once received. r=gsvelto
(cherry picked from commit b23813f55bb473cd015714f307a6f57166459d19)
Merge pull request #15037 from etiennesegonzac/bug-947540-add-contact-fluff

Bug 947540 - Proper role=button on keypad keys. r=rik
(cherry picked from commit f92169bf413fded0414d56eb393d14cc32fe5a8c)
Merge pull request #14986 from steveck-chung/bug-947282

Bug 947282 - [Messaging] Bubbles style is not working properly with subject.  r= borjasalguero, a=status-b2g-v1.3 blocking
(cherry picked from commit 02589d74c0c3e7537996b95abbe81aa995e79d0c)
Merge pull request #14833 from steveck-chung/bug-948356

Bug 948356 - [SMS] Keyboard is still opened when message options menu displayed . r=borjasalguero, a=blocking-b2g 1.3+
(cherry picked from commit 24bb4bfb0cbad51de8bc3eb014614d1f1c5940ab)
Merge pull request #15089 from nullaus/bug952305-net-error

bug 952305
(cherry picked from commit 5fb2937233c670f311725e62a81fb88b487406ff)
Merge pull request #14597 from dominickuo/bug-947443

Bug 947443 - [music] Only init the communication when music is not in picker mode, r=jimporter
(cherry picked from commit 5cc733b7e61c820d00b6e63466cabc4e357eab36)
Merge pull request #15145 from JerryShih/bug-951812-gallery-release-gl-context

Bug 951812 - [Gallery] Release webgl context when we leave editor mode
(cherry picked from commit e20ca482b4eb862da2e1052ce6e09bd89e332e7b)
Merge pull request #15150 from luke-chang/921800_cannot_relaunch_app_under_attention_screen

Bug 921800 - [Buri][fugu][Home screen][call]Can't enter into setting again during a call if the settings was in the foreground, r=alive
(cherry picked from commit 47206ac66b084c6f6c4503a3b10d0e0760df2b6f)
Merge pull request #15139 from gitmai/bug-950009-Appear-Balance-options-on-settings

Bug 950009 - [Costcontrol] Appear Balance options during some seconds wh...
r=salva
(cherry picked from commit ab9a57738ceb871b5335bb99cd720148686f842f)
Merge pull request #15148 from gitmai/bug-949977-Topup-option-not-visible

Bug 949977 - [Costcontrol] Topup option not visible after FTE finished
r=salva
(cherry picked from commit a252fea2946e413e1f8368a779486211bb1bf4e8)