Merge branch 'master' into 'master'

Prevent rendering issue and adjust screen timeout when downloading resource

See merge request core-developers/forge!2055

forge-gui/src/main/java/forge/download/GuiDownloadService.java

@@ -255,7 +255,9 @@ public abstract class GuiDownloadService implements Runnable {
         byte[] buffer = new byte[1024];
 
         for (Entry<String, String> kv : files.entrySet()) {
-            if (cancel) { break; }
+            if (cancel) {//stop prevent sleep
+                GuiBase.getInterface().preventSystemSleep(false);
+                break; }
 
             count++;
             cardSkipped = true; //assume skipped unless saved successfully