Bug 1027401 - Change child event mechanism
Merge pull request #21438 from ian-liu/settings/wifi/bug1033183_server_certificate_items_are_duplicated_when_disabling_and_reenabling_wifi

Bug 1033183 - [Wifi] Server certificate items are duplicated when disabling and re-enabling wifi, r=arthur
(cherry picked from commit e970c7e69c213fd896383b0dc7b85a1b7b1d7dc8)
Merge pull request #21501 from 6a68/bug-1032938-use-fmd-prod-servers

Bug 1032938 - Point find my device at production servers (resubmitted). ...
Merge pull request #21477 from timdream/settings-disable-lock-passcode

Bug 1034183 - Disable lock screen also disables pass code lock, r=arthurcc
Merge pull request #21272 from pacorampas/1029955

Bug 1029954 - [Dialer][Call Screen][Conference] Icon size is larger than others and overlapped with 'Conference' when call hanging up r=rik
Merge pull request #21440 from Cwiiis/bug1033444-drag-icon-over-header-at-top

Bug 1033444 - Fix jitter when dragging over header at scroll=0. r=kgrandon
Merge pull request #21543 from eliperelman/bug-1036436-add-video-to-perf-startup-whitelist

Bug 1036436 - Add video app to performance startup whitelist r=hub
Conflicts:
	tests/performance/startup_events_test.js
Merge pull request #21551 from TheoChevalier/bug-1036102-calendar-switch-overlapp

Bug 1036102 - [B2G][2.0][Calendar] The change to a toggle for All day events causes overlap on many languages
Merge pull request #21544 from guilherme-pg/bug1036423-permission-permission

Bug 1036423 - Reintroduce "permissions" permission to Find My Device.
Bug 1031890 - [Lazy Load] Vertical homescreen takes a long time to load
Bug 1031890 - Vertical homescreen takes a long time to load
Merge pull request #20955 from weigao123/push_master

Bug 1002327 - (master) add EventListener for mmi reply. r=Etienne.
(cherry picked from commit 8b742fde1be1226931eb198997994f4297375acd)
Bug 1016885 - Send a notification instead of displaying the dialer when receiving an unsolicited USSD notification r=etienne

(cherry picked from commit ddbf0e11b494fd9665545141485d0b70cab6d514)
Bug 1016885 - Always initialize the MmiManager before sending a notification r=etienne

(cherry picked from commit c664153cd702ae1db12a485e539bae88b9bdcdea)
Merge pull request #21538 from gabrielesvelto/bug-1016885-v2.0-uplift

Bug 1016885 - v2.0 uplift
Merge pull request #21561 from alivedise/bugzilla/1027401_v2.0/child-window-event-handler

Bug 1027401 - Change child event mechanism, r=etienne
Merge pull request #21546 from julienw/1033472-improve-node-modules-dependencies

Bug 1033472 - Gaia linter, gaia-build tests aren't using NODE_MODULES_GI...
(cherry picked from commit 10f141af83815940d1bd2b00a05c4f2e0965a0e3)
Merge pull request #21605 from julienw/1033472-v2.0-improve-node-modules-dependencies

a=tests
Merge pull request #21546 from julienw/1033472-improve-node-modules-depe...
Bug 1028789 - [Sora]There is no character counter inside STK submenus
Merge pull request #21616 from mcjimenez/bug1028789_v2.0

Bug 1028789 - [Sora]There is no character counter inside STK submenus (r = vingtetun)