Bug 1035480 - Add new locales to Gaia and get the same list on 2.0
Merge pull request #21469 from TheoChevalier/new-locales-2.0

Bug 1035480 - Add new locales to Gaia and get the same list on 2.0
Merge pull request #20708 from mcav/clock-perf-5

Bug 1015386 - [Clock] Implement new startup loading events. r=hub
Conflicts:
	tests/performance/startup_events_test.js
Bug 1023877 - Fixed reference workloads to work on flame. r=dhunt
Merge pull request #21487 from rnowm/1035670

Bug 1035670 - [BB] Create new shared component to manage icon fonts r=pivanov
Merge pull request #20948 from millermedeiros/837671-startup-events

Bug 837671 - [calendar] Implement new startup loading events r=gaye
Conflicts:
	apps/calendar/index.html
	tests/performance/startup_events_test.js
Merge pull request #21699 from EverythingMe/1028674-collection-icon-dedupe

Bug 1028674 - [Collection app] Generated icon shows duplicate apps
Bug 1015388 - [Contacts] Implement new startup loading events

Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
Merge pull request #21515 from weigao123/Bug980217-master

Bug 980217 - [master] Make "Skip" and "OK" buttons show when entering SIM 2 PIN code. r=Alive
Conflicts:
	apps/system/js/system_dialog.js
Bug 1039961 - [B2G][OTA] The migration process is performed twice if the user enters in the tutorial
Merge pull request #21812 from empoalp/bug_1039199

Bug 1039199 - [Dialer] When you put the phone on your ear, tones are not...
r=etienne
Merge pull request #21839 from dmarcos/bug1024384

Bug 1024384 - [Flame] When changing default media storage from Internal ...
Conflicts:
	apps/camera/js/lib/storage.js
Bug 1040068 - Inconsistency in [contacts] buttons
Merge pull request #21792 from davidflanagan/bug1037097

Bug 1037097: restrict image decode size in MediaFrame based on device memory size
Conflicts:
	apps/gallery/manifest.webapp
	apps/sharedtest/test/unit/media_frame_test.js
Merge pull request #21776 from azasypkin/bug-1022575-on-delete-v2.0

 Bug 1022575 - Received SMS store (without text) on check balance. Listening "ondelete" event for the deleted threads. r=julien
Merge pull request #21834 from KevinGrandon/bug_1029902_low_memory_features

Bug 1029902 - [Vertical Homescreen] Implement device capability configuration
Merge pull request #21825 from empoalp/bug_1038616

Bug 1038616 - [Dialer] Busy tone not playing
Merge pull request #21508 from millermedeiros/1002904-shared-icon-font

Bug 1002904 - calendar cold launch regression 100ms hamachi Apr23-Apr25 r=gaye
Revert "Merge pull request #21704 from Cwiiis/bug1038185-close-utility-tray-transition"

This reverts commit ba22e5fe47ed6b976363dffdc481575b868c407b.
Merge pull request #21856 from Cwiiis/bug1038185-close-utility-tray-transition

Bug 1038185 - Fix transition when closing utility tray. r=etienne