Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in camera, there will be a cropping issue towards the end of the video
Merge pull request #20996 from KevinGrandon/bug_1029040_collections_offline_experience

Bug 1029040 - [Collection app] Do not allow creation of collections while offline
Merge pull request #21000 from lightsofapollo/faster-homescreen-removes

Bug 1029891 - Remove items from the homescreen async without activities.
Merge pull request #21007 from jimporter/ringtones-validate

Bug 1017421 - [ringtones][Flame only] previewing ringtones doesn't stop ...
Merge pull request #21042 from vingtetun/bug1028661

Bug 1028661: Fixed issue [Rocketbar] Overlay of homescreen and searh res...
 Bug 1029853 - Hide open browser screens when browser invoked via activity. r=daleharvey
Merge pull request #21079 from KevinGrandon/bug_1030215_collection_attributes

Bug 1030215 - [Smart Collections] SC contextual menu is not localized
Merge pull request #21056 from millermedeiros/1030552-month-all-day-l10n

Bug 1030552 - [Calendar] "All day" on month view is not localized for All day events r=gaye
Merge pull request #20639 from yglazko/fmd_settings_url

Bug 992929 - URL in FMD device Settings is Incorrect
Conflicts:
	apps/settings/elements/findmydevice.html
Merge pull request #21048 from etiennesegonzac/bug-1027768

Bug 1027768 - Keep all role=system apps out of the cardview without breaking r=21
Merge pull request #21078 from vingtetun/bug1030664

Bug 1030664 - The contextmenu ui of the search app stays over results. r...
Conflicts:
	apps/search/js/search.js
Merge pull request #21009 from mnjul/bug_1029145_notifications_not_clear_when_app_lockscreen

Bug 1029145 - [B2G][Notification]Notifications do not clear from the status bar when the related app is behind the lockscreen. r=timdream
Merge pull request #20763 from guilherme-pg/bug1027429-honor-track-duration

Bug1027429 - Honor duration for track command in Find My Device
Merge pull request #21058 from vingtetun/bug1030675

Bug 1030675 - Handle search app crashes. r=kgrandon
Revert "Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe"

This reverts commit c80c6ae1b3214a60e8ac5b19e8206334737e3af3.
Merge pull request #21117 from nullaus/v2.0

Merge pull request #21069 from nullaus/bug1022804
Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)

Cherry pick of e64d7adf507d0f0164988257d30600499b1e5776 for v2.0 with manual change of
adding `evt = require('evt')`
Merge pull request #21123 from jrburke/bug1025727-v2.0-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s) r=mcav a=bajaj
Merge pull request #20232 from jmcanterafonseca/fix_import_sim_dups_2

Bug 1021548 - Importing second time from SIM card yields to errors in th...
Merge pull request #20687 from RudyLu/keyboard/Bug1023164-Shift_key_style

Bug 1023164 - [Keyboard] Shift Key for Caps Visual improvement.
r=timdream.