Merge pull request #21204 from 6a68/bug-1028943-fmd-erase-media

Bug 1028943 - Only factoryReset() after all calls to delete() finish. r=...
Merge pull request #21019 from crdlc/bug-1029847-v2

Bug 1029847 - [B2G][2.0][Flame][Vertical Homescreen] Icons dont keep the same order after OTA update
Merge pull request #21296 from 6a68/bug-1032903-erase-all-storages

Bug 1032903 - Erase internal storage if SDcard is default. r=ggp
Merge pull request #21544 from guilherme-pg/bug1036423-permission-permission

Bug 1036423 - Reintroduce "permissions" permission to Find My Device.
Merge pull request #21268 from ferjm/bug1028398.fxapermission

Bug 1028398: FxA will silently provide user's email to privileged apps i...
Conflicts:
	apps/settings/manifest.webapp
Merge pull request #21830 from Rik/facebook-callscreen-1032725

Bug 1032725 - Facebook contact infos are not reflected in call screen
Merge pull request #21842 from dmarcos/bug1037638

Bug 1037638 - Restrict to 3MP images (CONFIG_MAX_IMAGE_PIXEL_SIZE) only ...
Merge pull request #21129 from guilherme-pg/bug1000323-force-reauth-when-disabling

Bug 1000323 - Reauthenticate the user when disabling Find My Device. r=gerard-majax
Merge pull request #21913 from nullaus/bug1038167

bug 1038167 - Update icons for Find My Device, Vertical Homescreen, Smar...
(cherry picked from commit 8388e81f0a08fb5b71cb2c37dbc3d3366edab61d)
Merge pull request #21931 from nullaus/bug1038167

bug 1038167 - Remove 80x80, 256x256. Add 84x84. Update System to correct...
(cherry picked from commit 3c2e98b35cd1f50e55be1c374ff460d9244c9514)