Streamline some code in the boot selection screen

As the previous change to it might break something

(cherry picked from commit 3001a8815e52ee23993258767ad55cb97e4ab60a)

lib/python/Screens/FlashImage.py

@@ -641,7 +641,7 @@ def getImagesList(self):
 		list = []
 		list12 = []
 		imagesList = GetImagelist()
-		mode = GetCurrentImageMode() or 1
+		mode = GetCurrentImageMode() or 0
 		self.deletedImagesExists = False
 		if imagesList:
 			for index, x in enumerate(imagesList):
@@ -673,7 +673,7 @@ def getImagesList(self):
 			list.append(ChoiceEntryComponent('', ((_("No images found")), "Waiter")))
 		self["list"].setList(list)
 		for index, slot in enumerate(list):
-			if type(slot[0][1]) is tuple and self.currentimageslot == slot[0][1][0] and mode == slot[0][1][1] or BoxInfo.getItem("hasKexec") and slot[0][1] == "Recovery" and recovery_booted:
+			if type(slot[0][1]) is tuple and self.currentimageslot == slot[0][1][0] and (not BoxInfo.getItem("canMode12") or mode == slot[0][1][1]) or BoxInfo.getItem("hasKexec") and slot[0][1] == "Recovery" and recovery_booted:
 				self["list"].moveToIndex(index)
 				break
 		self.selectionChanged()