Bug 974070 - [build system] install-gaia fails to kill the app when there is a SEC column (peak)
Bug 971515 - [System2] Instantiable MediaRecording
NOBUG - Enable Travis-CI for bubble-tea branch
Merge pull request #16551 from cctuan/974070

Bug 974070 - [build system] install-gaia fails to kill the app when there is a SEC column (peak)
Bug 971546 - [System2] Instantiable Screenshot
Merge pull request #16549 from timdream/system2-screenshot

Bug 971546 - [System2] Instantiable Screenshot, r=alive
Merge remote-tracking branch 'b2g/bubble-tea' into bubble-tea
Merge remote-tracking branch 'b2g/master' into bubble-tea
Merge remote-tracking branch 'upstream/master' into bubble-tea
Bug 971577 - [System] Make visibility manager instantiable
Merge pull request #16588 from huchengtw-moz/system/Bug_971515_instantiable_media_recording

Bug 971515 - [System2] Instantiable MediaRecording, r=alive
Merge pull request #16591 from rexboy7/system-bug971577-bubbletea

Bug 971577 - [System] Make visibility manager instantiable. r=alive
Bug 961800 - Implement Child Window Factory
Merge pull request #16556 from alivedise/bugzilla/961800_master/child-window-factory

Bug 961800 - Child Window Factory, r=etienne.
Bug 971473 - [System2] Instantiable CallForwarding

- update bootstrap_test
- add related tests for call_forwarding
- refactor call_forwarding
Merge remote-tracking branch 'upstream/master' into bubble-tea

Conflicts:
	apps/system/js/cards_view.js
Merge pull request #16590 from EragonJ/bug-971473

Bug 971473 - [System2] Instantiable CallForwarding
Bug 971556 - [System2] Instantiable SourceView.
Bug 971512 - [System] Instantiable layout manager
Merge remote-tracking branch 'upstream/master' into bubble-tea