bug 1041841 - Manually trigger translation of element since l10n API does not use MutationObserver in 2.0. r=crdlc
Bug 1026159 [2.0 uplift] override search result label styles to wrap 2 lines, tighten up grid and search results layout per spec. r=kgrandon
Merge pull request #21921 from gitmai/bug-997787-page-resize-settings

Bug 997787 - Page resizes when resetting usage from Settings menú
r=salva
Merge pull request #21837 from guilherme-pg/bug1034088-offline

Bug 1034088 - Display the proper Settings panel for Find My Device when offline.
Merge pull request #21195 from guilherme-pg/bug1030249-report-disabled

Bug 1030249 - Notify the server if Find My Device is disabled. r=gerard-majax
Merge pull request #22131 from nullaus/bug1041841

bug 1041841 - Manually trigger translation of element since l10n API doe...
Revert "Merge pull request #21195 from guilherme-pg/bug1030249-report-disabled"

This reverts commit 9b6d7357031f2412b18a2fb140d5c974842d4393.
Merge pull request #22135 from timdream/keyboard-canvas-fix

Bug 1043752 - willReadFrequently for keyboard/js/render.js, r=rudyl
Merge pull request #22130 from dmarcos/bug1043307

Bug 1043307 - Front camera image is rotated by 180 degree in landscape m...
Merge pull request #22184 from dmarcos/bug1036259master

Bug 1036259 - [dolphin] unable to take video after removing and insert S...
Merge pull request #22082 from aajain/bug_1042357

Bug 1042357 - Code to removeEventListener for radiostatechange in radio.js is not working r=arthur.chen
Revert "Merge pull request #21804 from gtorodelvalle/v2.0-bug-1018283-uplifting"

This reverts commit a89900c2a38cf2b61245807c75ffdb76d49e72f6, reversing
changes made to abdb110c6421c53221ab2d59ddb536bfc062e7a8.
Merge pull request #22003 from jaoo/1038749

Bug 1038749 - [B2G][Audio Channel]After playing sound through front speaker, all sound will play through front speaker instead of speakerphone. r=etienne
Merge pull request #22092 from millermedeiros/1042422-refresh-disabled

Bug 1042422 - [B2G][Calendar] Refreshing calendar causes events to be pu.lled down for accounts that are disabled r=gaye
Merge pull request #22186 from mcav/improved-retry-logic

Bug 1042190 - [Email] Improve IMAP retry logic. r=asuth
Merge pull request #22187 from mcav/kill-unused-connections

Bug 1042197 - [Email] Close IMAP connections. r=asuth
Bug 1041710: ensure that wallpaper size always exactly matches screen size

when computing screen size for wallpaper pick activity use Math.ceil to get 854 instead of 853.5 for FWVGA

Unit tests for wallpaper_manager.js plus fix a broken bootstrap test

address review comments
(cherry picked from commit 7815e901b5ccec40b22987a10d002bb1225d8d17)

Conflicts:

	apps/settings/js/panels/display/wallpaper.js

remove special low-tolerance case for PNG image comparison in image_utils unit test because it caused failures on TBPL
Merge pull request #22178 from mikehenrty/bug-1036191-import-headers

Bug 1036191 - include font utils in import page
Revert "Bug 980217 - Remove extra line leftover from rebasing. a=bustage"

This reverts commit 6ccd97a605e7f4ccad2fa92ac9575b35028e07a7.
Revert "Merge pull request #21515 from weigao123/Bug980217-master"

This reverts commit 041c794bdce3a81767d1c60e776227f5c4d42651.