Merge remote-tracking branch 'origin/4.1'

cura/OAuth2/AuthorizationService.py

@@ -130,6 +130,7 @@ class AuthorizationService:
             self._storeAuthData(response)
             self.onAuthStateChanged.emit(logged_in = True)
         else:
+            Logger.log("w", "Failed to get a new access token from the server.")
             self.onAuthStateChanged.emit(logged_in = False)
 
     ##  Delete the authentication data that we have stored locally (eg; logout)

resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml

@@ -57,7 +57,7 @@ Item
             {
                 id: networkPrinterScrollView
 
-                maxItemCountAtOnce: 6  // show at max 6 items at once, otherwise you need to scroll.
+                maxItemCountAtOnce: 10  // show at max 10 items at once, otherwise you need to scroll.
 
                 onRefreshButtonClicked:
                 {