Bug 1055874 - Should not skip the current navigation when there is a pending one
 Bug 1057023 - [Calendar] Event Icons are not changed in months other than the selected one when enabling/disabling calendars
Bug 1058555 - Updating preloaded apps in FOTA/OTA results in duplicate apps in /data/local/webapps r=gduan
Bug 1043870 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/homescreen_navigation_test.js | Homescreen navigation > Going to the homescreen and back to a warm app r=kgrandon a=npotb
Merge pull request #23304 from luke-chang/1056493_v1.4_contacts_to_homescreen_delay

Bug 1056493 - [Dolphin][Hamachi][v1.4]No icons show for several seconds when back to homescreen from contacts, r=alive
Merge pull request #23554 from yurenju/uuid-v2.0

Bug 1058555 - Updating preloaded apps in FOTA/OTA results in duplicate apps in /data/local/webapps r=gduan
Merge pull request #23393 from crh0716/1055874_v2.0

Bug 1055874 - Should not skip the current navigation when there is a pending one r=eragonj
Bug 1059488 - [MobileID] Country code manual selection dialog seems broken. r=alive

Conflicts:
	apps/system/js/mobileid_dialog.js
Bug 1058330 - Use the 'geolocation-noprompt' permission in Find My Device r=mgoodwin
Merge pull request #23386 from millermedeiros/1057023-month-view-dots-2.0

Bug 1057023 - [Calendar] Event Icons are not changed in months other than the selected one when enabling/disabling calendars r=gaye
Merge pull request #23768 from guilherme-pg/v2.0

Bug 1058330 - Use the 'geolocation-noprompt' permission in Find My Devic...
Bug 1054827 - [FTU][FTE] "Enter PIN code" for SIM2 page flashing and keypad not shown after flashing stops

Conflicts:
	apps/system/test/unit/sim_lock_test.js
Revert "Bug 1054827 - [FTU][FTE] "Enter PIN code" for SIM2 page flashing and keypad not shown after flashing stops"

This reverts commit 35533237253ff5a27e9301a9031c4cc4b1d95eb5.