Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
Bug 986484 - Make the outer div of contact details unscrollable
Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau
Bug 987282 - JSHint allow getter without setter globally r=julienw
Bug 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers)
Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL
Revert "Merge pull request #17619 from KevinGrandon/revert_camera_features"

This reverts commit 9b093b55fd98d8a86251397a196fd9591a35a88e, reversing
changes made to c8c0c65f334a50c99638841a4593dc6394d29c62.
Bug 988118 - Gaia unit test failures on TBPL due to the camera merge
Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new contact through the dialer app
Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809
Merge pull request #17634 from yurenju/stage-windows-squash-2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl...
Merge pull request #17635 from viorelaioia/bug_986531

Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809
Merge pull request #17448 from comoyo/bug986484

Bug 986484 - Make the outer div of contact details unscrollable. r=arcturus
[MADAI][Email] @2.25x assets update for Email
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" windows bustage

This reverts commit fdd45a31b8372e0f58de51af1856e0a381fe99fa.
Merge pull request #17632 from jmcanterafonseca/fix_date_l10n

Bug 987966 - [contacts] placeholder for date fields in add/edit mode is ...
Merge pull request #17519 from crdlc/bug-986047

Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new ...
Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik