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