Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDetector
Merge pull request #16818 from dwi2/bug979212

Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDet...
Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubble-tea""

This reverts commit a76dc9b333ef8b24e0ea20e50116abb1914ab285.
fix app_window_manager.js
Merge remote-tracking branch 'upstream/master' into bubble-tea-merge4

Conflicts:
	apps/system/js/app_window.js
	apps/system/js/simcard_dialog.js
	apps/system/test/unit/activities_test.js
	shared/test/unit/mocks/mock_navigator_moz_mobile_connections.js
Merge pull request #16939 from gasolin/bubble-tea-fix

Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubb...
Merge remote-tracking branch 'upstream/master' into bubble-tea-merge4
Merge pull request #16975 from gasolin/bubble-tea-merge4

Bubble tea merge4
Bug 935859 - [Keyboard] Remove the sendString method from pinyin IME
Merge pull request #16895 from shamenchens/B935859

Bug 935859 - [Keyboard] Remove the sendString method from pinyin IME.
r=rudylu
Revert "Merge pull request #16895 from shamenchens/B935859"

This reverts commit a37eebd5f911c54eaa67613f70de2b8fc66109be, reversing
changes made to e2038e3c4a29b892804bae90fbc99971a0da03c7.
Merge pull request #17011 from gasolin/backout-935859

Revert "Merge pull request #16895 from shamenchens/B935859", make marionette test pass
Revert "Merge pull request #16588 from huchengtw-moz/system/Bug_971515_instantiable_media_recording"

This reverts commit 37739cb918affe7080960a7525f6b7e0e81318bb, reversing
changes made to 84446d88705396651afc97ae626e62666f9e14de.

Conflicts:
	apps/system/js/media_recording.js
	apps/system/test/unit/bootstrap_test.js
Merge pull request #17008 from gasolin/bubble-back-971515

Revert "Merge pull request #16588 from huchengtw-moz/system/Bug_971515_i...
Bug 979827 - [Build] check node version of environment