Bug 1088157 - Unlock lockScreen when FTU starts. r=timdream
Bug 1093951 - Entering wifi power save mode when screen off. r=alive

While screen is off, wifi would go to power save mode only
when wifi lock is held. If wifi lock is not held, wifi would
stay on and be turned off after |wifi.screen_off_timeout|.
We can more aggressively request the wifi driver to enter
power save mode before timed out. This is what the patch
intends to do.
Merge pull request #25819 from mikehenrty/bug-1090152-fix-icon-visibility

Bug 1090152 - Make sure we display statusbar icons on lockscreen even wi...
Conflicts:
	apps/system/test/marionette/lib/statusbar.js
Bug 1089505 - [NFC][Software Home Button] yes/no button covered by SW home button
Merge pull request #26125 from nullaus/bug1077595

Bug1077595
(cherry picked from commit 906123b6d71bcd9d8db77227ffba7269e6cbaeb9)
Merge pull request #26307 from nullaus/v2.1

Merge pull request #26125 from nullaus/bug1077595
Merge pull request #25973 from KevinGrandon/bug_1095187_debug_download_intermittent_test

Bug 1095187 - Software Home Button - File Open Error Proper layout for file error dialog - Wait for download success +autoland
(cherry picked from commit c680e54411a729a2ed040432cec4247fa2a8b44d) a=test-only
Merge pull request #26308 from nullaus/v2.1

Merge pull request #25973 from KevinGrandon/bug_1095187_debug_download_i...
Merge pull request #26126 from sfoster/unlock-in-ftu-2_1-bug-1088157

Bug 1088157 - Unlock lockScreen when FTU starts. r=timdream a=bajaj
Revert "Merge pull request #25607 from mancas/bug1082936_v2.1"

This reverts commit 57401e89cf8dfb7cd6f6b589ed9a3a8974b05c9b, reversing
changes made to a27f0fbfb0e4aeedbf9a518e2409cecf2b7b5970.
Bug 1065973 - Change lock method to turn screen off/on
Merge pull request #26333 from viorelaioia/bug_1065973

Bug 1065973 - Change lock method to turn screen off/on
Bug 1088224 - Ensuring resent notification do not overwrite new ones r=mherentty
Bug 1088224 - Skipping notification overwrite test until gecko patch lands
Merge pull request #26092 from elefant/bug/1093951-wifi-powersave-v2_1

Bug 1093951 - Entering wifi power save mode when screen off. a=bajaj
Merge pull request #26129 from crh0716/1098684

Bug 1098684 - Hide the AP PIN item r=eragonj
Merge pull request #26344 from mikehenrty/lissyx-with-test-skip

Lissyx with test skip a=bajaj
Merge pull request #26237 from mancas/bug1089505_v2.1

Bug 1089505 - [NFC][Software Home Button] yes/no button covered by SW home button a=bajaj
Merge pull request #26160 from mikehenrty/bug-1090152-uplift

Merge pull request #25819 from mikehenrty/bug-1090152-fix-icon-visibility a=bajaj
Bug 1086686 - [2.1][l10n][Settings] Basque: The USB button header text