Merge branch 'Plasma/5.17'

applets/systemmonitor/common/contents/ui/ConfigGeneral.qml

@@ -164,8 +164,10 @@ Item {
                             }
                         } else {
                             var idx = cfg_sources.indexOf(model.source);
-                            if (idx !== -1) {
+                            if (cfg_sources.length !== 1) { // This condition prohibits turning off the last item from the list.
-                                cfg_sources.splice(idx, 1);
+                                if (idx !== -1) {
+                                    cfg_sources.splice(idx, 1);
+                                }
                             }
                         }
                         cfg_sourcesChanged();

lookandfeel/contents/components/SessionManagementScreen.qml

@@ -25,7 +25,7 @@ import QtQuick.Controls 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-FocusScope {
+Item {
     id: root
 
     /*

lookandfeel/contents/lockscreen/LockScreenUi.qml

@@ -233,7 +233,6 @@ PlasmaCore.ColorScope {
 
                 showUserList: userList.y + mainStack.y > 0
 
-                focus: true // Drop this and hack below when porting this stackview to QQC2
                 Stack.onStatusChanged: {
                     // prepare for presenting again to the user
                     if (Stack.status == Stack.Activating) {