Make sure to force unload a preloaded screen

monarch/monarch.lua

@@ -354,8 +354,10 @@ local function unload(screen, force)
 	if screen.proxy then
 		log("unload() proxy", screen.id)
 		if screen.auto_preload and not force then
+			if screen.loaded then
 				msg.post(screen.proxy, DISABLE)
 				screen.loaded = false
+			end
 			screen.preloaded = true
 		else
 			screen.wait_for = PROXY_UNLOADED
@@ -1085,7 +1087,7 @@ function M.unload(id, cb)
 		end
 		run_coroutine(screen, when_unloaded, function()
 			change_context(screen)
-			unload(screen)
+			unload(screen, true)
 		end)
 	end)
 	return true -- return true for legacy reasons (before queue existed)