Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu.

Conflicts:
	apps/settings/js/findmydevice.js
	apps/settings/js/panels/root/panel.js
Merge pull request #20924 from crh0716/1022992_v2.0

Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu. r=arthurcc
Bug 1028906 - [v2.0][v2.1] Marketplace launch test is failing at "set_permission('Homescreen', 'geolocation', 'deny')"
Merge pull request #20928 from AndreiH/bug_1028906

Bug 1028906 - [v2.0][v2.1] Marketplace launch test is failing at "set_pe...
Merge pull request #20710 from 6a68/bug-1027325-fmd-check-passcode-state

Bug 1027325 - Correctly check passcode state from find my device
Merge pull request #20645 from bentian/bug-1026475

Bug 1026475 - Device switch from Handset/Headset to BTSCO fails during call, r=etienne
Merge pull request #20575 from acperez/bug-1025829

Bug 1025829 - Browser single variant Top Sites are not ordered correctly.
Merge pull request #20657 from azasypkin/bug-1026528-corrupted-attachment

Bug 1026528 - [Messages] Corrupted attachments do not display correctly. r=julienw
Merge pull request #20684 from ferjm/bug1023860.cancelmobileid

Bug 1023860 - Canceling the UI flow should clean up pending content requ...
Merge pull request #20408 from alivedise/bugzilla/1021658/turn-child-window-off

Bug 1021658 - Pref off in app sheet and disable popup on transitioning, r=etienne
Merge pull request #20547 from alivedise/bugzilla/1023812_master/find-bottom-most-window-to-open-or-close

Bug 1023812 - Find bottom most window to do open/close operation when ac...r=timdream
Merge pull request #20641 from millermedeiros/1023777-account-warning

Bug 1023777 - [B2G][Calendar] Account warning icon is bigger than it should r=gaye
Merge pull request #20642 from jimporter/ringtones-manage-activity

Bug 1024779 - [ringtones] edge gestures doesn't work
Bug 1026069 - Remove horizontal scroll from search suggestions. r=kgrandon
Merge pull request #20644 from cctuan/1024940

Bug 1024940 - [Settings] Permissions that are explicit for privileged or web apps are not shown on Settings -> Apps permissions
Merge pull request #20659 from cctuan/1020264

Bug 1020264 - [flame] Status bar is displayed after launching video app and you can't play a video until it dissapears
Merge pull request #20733 from pacorampas/missing-headset-oncall-1018495

Bug 1018495 - [Flame][Dialer] Missing headset icon when calling r=rik
Merge pull request #20316 from DouglasSherk/1022746-dialer-call-log-apzc

Bug 1022746 - Remove requestAnimationFrame from FontSizeUtils to fix frames falling back to sync panning and zooming. r=vingtetun
Merge pull request #20731 from alivedise/bugzilla/1024168_master/v2/dispatch-event-of-inner-window

Bug 1024168 - Dispatch inner window event on its element, r=etienne
Bug 1028685 - [Collection app] Edit header obscured