Bug 979914 - Investigate failure in test_cost_control_reset_wifi
Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail
Bug 961563 - [TABLET] Support specifying target device type in Gaia build script.
Bug 970028 - Nicer activity opener animation
Merge pull request #17451 from rnowm/986512

Bug 986512 - Switches [BB] remove transition
Bug 986462 - Unxfail test_dialer_find_contact as Bug 983054 is fixed
Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn
Bug 964180 - Introduce AMD to settings app
1. Support new panel model
2. Separate common logic to SettingsCache, PanelUtils, PageTransitions
Merge pull request #17503 from alivedise/bugzilla/970028_master_v2/nicer-activity-animation

Bug 970028 - Nicer activity opener animation
Merge pull request #17508 from crh0716/964180

Bug 964180 - Introduce AMD to settings app, r=evelyn, etienne
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
Merge pull request #17474 from gitmai/bug-986473-CC-modify-parameters

Bug 986473 -Modify cost control parameters
r=salva
Merge pull request #17510 from yurenju/stage3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Bug 973547 - Enter device name overlay has a wrong layout.
Merge pull request #17386 from nucliweb/973827-Power-button-modal

Power-button-modal
Merge pull request #17321 from pacorampas/973547

Bug 973547 - Enter device name overlay has a wrong layout.
Revert "Bug 960861 - mozMobileConnections should not be requisites for airplane mode" for suspicion of breaking marionette tests

This reverts commit abd710def22c5244dfa8959b15ca49954a58e12c.
Revert "Bug 961800 - Implement Child Window Factory."

This reverts commit 769a5b332ae1fb7758583006567e05ac8dd42dc1.
Bug 983594 - Avoid making several calls from detail view at the same time
Revert "Merge pull request #17386 from nucliweb/973827-Power-button-modal"

This reverts commit 3ba39ebd3fd4613640f9477898a008580ef8fb41, reversing
changes made to ad3ff4d8515803a5467957f3c39faf83653b5510.