Bug 1046131 - [v2.0] Investigate intermittent failure in test_cost_control_reset_wifi.py
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...
Merge pull request #22807 from 6a68/bug-1038992-fixedup

Bug 1038992 - FxA "forgot password" link crashes refreshAuth flow. r=fer...
Merge pull request #22743 from mcav/net-end

Bug 1048487 - [email/backend] node-net.js's end() method does not actual...
Merge pull request #22816 from dmarcos/bug1051200

Bug 1051200 - Camera brightness blocked after touch-focusing on dark zon...
Bug 1043662 - [Flame] Missing labels in Firefox Ringtones and Alerts
Merge pull request #22844 from lodr/bug-1043662-missing-labels

Bug 1043662 - [Flame] Missing labels in Firefox Ringtones and Alerts
r=yurenyu
Merge pull request #22866 from mikehenrty/bug-1050023-v1.4

Bug 1050023 - Do not wake the screen for download notifications
Revert "Merge pull request #22866 from mikehenrty/bug-1050023-v1.4"

This reverts commit 2b42351cbc8f652b1cbafb76768386546d752204.
bug 1049790 - Use one event listener for system time changes. r=fcampo
Merge pull request #22799 from nullaus/bug1049790

bug 1049790 - Use one event listener for system time changes. r=fcampo
Merge pull request #22866 from mikehenrty/bug-1050023-v1.4

Bug 1050023 - Do not wake the screen for download notifications