Bug 968912 - Make an app object for FTU and write a test for desktopb2g/CI
Bug 972699 - Fix unit test zero coverage when using lazy load
Bug 939791 - [settings] keyboard: {{type}} in mustHaveOneKeyboard is empty for text keyboards
Power-button-modal
Bug 986512 - Switches [BB] remove transition
Bug 986473 -Modify cost control parameters
Bug 961800 - Implement Child Window Factory.

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css
Merge pull request #16891 from RickyChien/bug-972699

Bug 972699 - Fix unit test zero coverage when using lazy load r=@yurenju
Revert "Merge pull request #17494 from gasolin/sheriff971554" for gaia-unit failures

This reverts commit c377f41d017d4b099e92fd7ecf67d9cd1cee1292, reversing
changes made to 3286e2a0cbcac52e38c0494ab614bac23cdc229f.
Merge pull request #17418 from alivedise/bugzilla/961800_master_merging/child-window-factory

Bug 961800 - Implement Child Window Factory, r=etienne
Bug 979914 - Investigate failure in test_cost_control_reset_wifi
Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail
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