Bug 1037284 - [NFC] Screen shows wired and NFC function broken when click home button while initial shrinking UI
Merge pull request #22711 from snowmantw/issue1037284-v2.0

Bug 1037284 - [NFC] Screen shows wired and NFC function broken when clic...
Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Merge pull request #22717 from viorelaioia/bug_1040063_v2.0

Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py fa...
Bug 1021732 - [Flame] Re-enable test_privileged_app_contacts_prompt
Merge pull request #22733 from chirarobert/unxfail_contacts_prompt

Bug 1021732 - [Flame] Re-enable test_privileged_app_contacts_prompt
Bug 1050339 - [B2G][Smart Collections] Default Smart Collections are missing their icons r=yurenju
Bug 1049259 - [B2G][Notes] Cannot attach a picture directly from the camera when creating a new note
Bug 1028664 - Collection icon rounds all app icons, but should only round E.me icons
Bug 1048005 - [EverythingMe] CDN urls for web results icons. r=me
Bug 1046131 - [v2.0] Investigate intermittent failure in test_cost_control_reset_wifi.py
Merge pull request #22637 from lightsofapollo/reland-webcomp-off

Bug 1038439 - Remove web components preference from Gaia. r=vingtetun
Bug 1050097 - [Camera] Add error handling while |videoStorage.addNamed| occurs error.
Bug 1042221 - [email/backend] v2.0 specific uplift of improved saving/shutdown behaviour. r=asuth,r=mcav,r=jrburke, a=blocking-b2g=2.0

This includes the following fixes:

Portions of Bug 921050 (background sending), primarily cleanup
cleanup portions authored by asuth, melded into mcav's background send logic, mcav did extra cleanup
r=asuth on the mcav bits, r=mcav on the asuth bits

Bug 1039007 - Do not invoke operation callbacks until after any associated saves have safely hit the disk.
patch by asuth, r=mcav

Bug 987931 - cronsync's self-close races an IndexedDB commit.
patch by asuth, portions by jrburke.  r=mcav, r=jrburke, r=asuth

This amalgamation prepared and tested by asuth.
Merge pull request #22810 from mpizza/Bug_1050097_v2.0

Bug 1050097 - [Camera] Add error handling while |videoStorage.addNamed| occurs error. r=diego.
Revert "Bug 1050097 - [Camera] Add error handling while |videoStorage.addNamed| occurs error."

This reverts commit 56a1bfe3fc03ab235a7aa6f2979c1cee95ca147b.
Merge pull request #22279 from asutherland/email-save-uplifts

Bug 1042221 - [email/backend] v2.0 specific uplift of improved saving/shutdown behaviour. r=mcav, r=jrburke, r=asuth, a=blocking-b2g=2.0
Merge pull request #22406 from viorelaioia/bug_1046131

Bug 1046131 - [v2.0] Investigate intermittent failure in test_cost_contr...
Merge pull request #22689 from KevinGrandon/bug_1051061_homescreen_dragdrop_error

Bug 1051061 - [VerticalHomescreen] TypeError: this.grid._grid.dragdrop is undefined
Merge pull request #22771 from jmcanterafonseca/fix_export_settings

Bug 1050843 - [B2G][Contacts] Export contacts buttons are overlaying Set...