Bug 1049259 - [B2G][Notes] Cannot attach a picture directly from the camera when creating a new note
Bug 1049198 - Camera/Video should use mark Color layer as [not visible] when covered by video
Revert "Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive" for JS exceptions

This reverts commit e13cc05b6d615664d769e55b60754480848d076b.
Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive
Merge pull request #22851 from 6a68/bug-1048994-fxa-tospp-l10n-back-button

Bug 1048994 - Properly render tos/pp in v2.0 after hitting 'back' button...
Merge pull request #22849 from 6a68/bug-1041034-email-input-obscured

Bug 1041034 - Remove FF logo from FxA to ensure email input is not obscu...
Revert "Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive"

This reverts commit bf33987e2729e82f1e3891eba3e85713f476fd0e.
Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive
Merge pull request #22942 from KevinGrandon/bug_1047645_to_2_dot_oh_2

Bug 1047645 - Use manual timeout to guard _closed event from not firing
Revert "Bug 1043708 - Music search bar should not have gradient background"

This reverts commit deaccef7409fd54e18c92c83383f39b7dca6f6dd.
Revert "Merge pull request #22844 from lodr/bug-1043662-missing-labels"

This reverts commit d889984833025f208cfd3f3c2c37c87940a529dc, reversing
changes made to 8b1b64ca3347e015d7a57df6d053f95cd26046ca.
Merge pull request #22945 from nullaus/bug1053509

bug 1053509 - Use plain js download object when download succeeds. r=crd...
(cherry picked from commit 385f8b1fc9179441c9d6a6ad16ff8701edfa1faa)
we wait for the full resolution picture to be deleted before adding the scaled down one
Merge pull request #23006 from nullaus/v2.0

Merge pull request #22945 from nullaus/bug1053509
Bug 1043662 - [Flame] Missing labels in Firefox Ringtones and Alerts
Merge pull request #22998 from lodr/bug-1043662-missing-labels

Bug 1043662 - [Flame] Missing labels in Firefox Ringtones and Alerts
r=yurenju
Merge pull request #22908 from jrburke/bug1001629-email-notification-close-blank

Bug 1001629: email notification clear triggers failure in startup r=asuth
Merge pull request #22868 from mpizza/Bug_1053614_release_status_bug

Bug 1053614 - [woodduck] repeatedly enter and leave camera app, then hig...h chance camera will be black screen when entering camera.
Merge pull request #22881 from ferjm/bug1049340.mobileiderroroverlay

Bug 1049340 - [Loop] Mobile Identity windows in background. r=alive
Conflicts:
	build/csslint/xfail.list
Merge pull request #22988 from mancas/bug1052938

Bug 1052938 - [B2G][Flame][2.0][Contact] No error message prompted when ...
Conflicts:
	apps/communications/contacts/test/unit/export/mock_export_utils.js