Bug 1035480 - Add new locales to Gaia and get the same list on 2.0
Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavailable
Merge pull request #21662 from snowmantw/issue1036236-2.0

 Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavail...
Merge pull request #20634 from DouglasSherk/1026081-missed-api

Bug 1026081 - [Dialer] Fix missed telephony API upgrade to TelephonyCallId. r=etienne
Merge pull request #21913 from nullaus/bug1038167

bug 1038167 - Update icons for Find My Device, Vertical Homescreen, Smar...
(cherry picked from commit 8388e81f0a08fb5b71cb2c37dbc3d3366edab61d)
Merge pull request #21924 from nullaus/v2.0

Merge pull request #21913 from nullaus/bug1038167
Merge pull request #21931 from nullaus/bug1038167

bug 1038167 - Remove 80x80, 256x256. Add 84x84. Update System to correct...
(cherry picked from commit 3c2e98b35cd1f50e55be1c374ff460d9244c9514)
Merge pull request #21932 from nullaus/bug1038167

bug 1038167 - Add 84x84 icons.
(cherry picked from commit 163a63012cdae5c6f77e5bba81a51ab35ac2cf32)
Merge pull request #21933 from nullaus/v2.0

V2.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