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 #21060 from justindarc/bug1014968-v2.0

Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in came...
Merge pull request #20605 from jmcanterafonseca/fix_sim_dups_final

Bug 1026369 - In import, contacts are duplicated.
Merge pull request #20801 from jmcanterafonseca/fix_sim_dups_another

Bug 1028106 - Invalid information of automated merged contacts and conta...
Merge pull request #21068 from KevinGrandon/bug_1030704_collection_divider

Bug 1030704 - [Collection app] Divider under pinned apps hidden
Merge pull request #21080 from KevinGrandon/bug_1030713_search_subdomain_dedupe

Bug 1030713 - [Collection app] Web results get wrongfully deduped
Merge pull request #21075 from vingtetun/bug1028933-landing

Bug 1028933 - Hide the context menu ui when the homescreen is not visibl...
Bug 1028192 - Disable ActiveSync tests
Merge pull request #21088 from KevinGrandon/lightsofapollo-bug-1027935

Bug 1027935 - Correctly handle pending upgrades as well as pause/resume of upgrade downloads
Merge pull request #21121 from KevinGrandon/AntonioMA-bug1027708_3

Bug 1027708 - Delay setting the collection datastore listeners until the datastore initial read
Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Merge pull request #20774 from 6a68/bug-1027950-settings-fmd-onerror-handlers

Bug 1027950 - [Settings][Find My Device] Do not attach handlers inside onerror callback
Conflicts:
	apps/settings/elements/findmydevice.html
Merge branch 'v2.0' of https://github.com/mozilla-b2g/gaia into v2.0
Merge pull request #20942 from DouglasSherk/1021175-callscreen-incorrect-wallpaper

Bug 1021175 - [Dialer] Fix incorrect wallpaper shown if the user changes it. r=etienne
Merge pull request #21131 from nullaus/bug1029609

bug 1029609 - Show spinner when loading new collections. r=kgrandon
Merge pull request #21137 from vingtetun/bug1026792.followup

Bug 1026792 - [Rocketbar] Rocketbar search should be cancelled when the ...
Merge pull request #21092 from KevinGrandon/bug_1031105_collection_filter_pinned

Bug 1031105 - [Collection] Edit mode can be triggered on unbookmarked eme apps if another e.me app is added twice to the top of that Smart Collection
Merge pull request #21140 from vingtetun/bug1030675.followup

Bug 1030675 - Handle search app crashes. Followup. r=kgrandon
Merge pull request #21122 from etiennesegonzac/bug-1028048

Bug 1028048 - Making sure the edge swipe detector forwards events to the topmost window r=21
Merge pull request #21084 from KevinGrandon/bug_1028452_smart_collection_geolocation

Bug 1028452 - [Collections] Opening a smart collection is slow
Merge pull request #21100 from steveck-chung/bug-1021513

Bug 1021513 - [Messages] Recipients list container scroll up automatically when dragging down. r=azasypkin