Merge lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2668 into lp:unity8

[Michał Sawicz]

=== removed file 'data/unity8-dash.conf'
--- data/unity8-dash.conf	2016-10-07 17:22:21 +0000
+++ data/unity8-dash.conf	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-description "Unity Shell v8 Dash"
-author "Michael Zanetti <[e-mail]>"
-
-emits scope-ui-starting
-
-start on started unity8
-stop on stopping unity8
-
-kill timeout 120
-
-# Focused app is 100 so we want to be less likely to get
-# killed than the focused app but more than Unity8
-
-oom score 50
-
-respawn
-respawn limit unlimited
-
-env APP_ID=unity8-dash
-
-pre-start script
-    initctl emit scope-ui-starting
-end script
-
-exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=unity8-dash.desktop
 
=== modified file 'data/unity8-dash.desktop.in'
--- data/unity8-dash.desktop.in	2016-04-20 13:22:20 +0000
+++ data/unity8-dash.desktop.in	2017-04-05 14:04:26 +0000
@@ -5,5 +5,4 @@
 Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-dash
 Terminal=false
 Icon=@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/Dash/unity8-dash.png
-NoDisplay=true
 X-Ubuntu-Touch=true
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-03-28 21:50:21 +0000
+++ debian/changelog	2017-04-05 14:04:26 +0000
@@ -1,3 +1,31 @@
+unity8 (8.15+17.04.20170404.7-0ubuntu1) zesty; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Tweak app drawer a bit (LP: #1667570)
+
+  [ Josh Arenson ]
+  * Make some small changes to the greeter's session list
+  * Handle a user in the greeter having never selected a session better
+    (LP: #1673199)
+
+  [ Lukáš Tinkl ]
+  * Do not occlude windows with an ongoing unmaximize transition (LP:
+    #1666363)
+  * Show and implement close buttons for child windows (LP: #1668053)
+  * Sanitize the logic for pointer vs. touch menus, fixes hiding the
+    window title in staged mode, when hovering the panel with mouse and
+    no menus available.
+
+  [ Michael Zanetti ]
+  * Don't hide the launcher on super press if it's locked visible (LP:
+    #1675373)
+  * fix searchfield selection in drawer (LP: #1677259)
+  * make sure the stage has focus when going to spread (LP: #1672053,
+    #1672673, #1676995)
+  * don't autostart the dash app, but show its .desktop file instead
+
+ -- Michał Sawicz <[e-mail]>  Tue, 04 Apr 2017 22:56:06 +0000
+
 unity8 (8.15+17.04.20170328.3-0ubuntu1) zesty; urgency=medium
 
   [ Albert Astals Cid ]
 
=== modified file 'debian/unity8.install'
--- debian/unity8.install	2016-10-04 16:21:38 +0000
+++ debian/unity8.install	2017-04-05 14:04:26 +0000
@@ -1,6 +1,5 @@
 debian/usr.bin.unity8-dash etc/apparmor.d
 var/lib/unity8/version
-data/unity8-dash.conf usr/share/upstart/sessions/
 data/unity8-filewatcher.conf usr/share/upstart/sessions/
 data/unity8.conf usr/share/upstart/sessions/
 data/devices.conf etc/ubuntu/
 
=== modified file 'plugins/LightDM/UsersModel.cpp'
--- plugins/LightDM/UsersModel.cpp	2017-01-19 15:25:53 +0000
+++ plugins/LightDM/UsersModel.cpp	2017-04-05 14:04:26 +0000
@@ -109,6 +109,11 @@
         variantData = stringData;
     }
 
+    // Workaround for liblightdm returning "" when a user has no default session
+    if (Q_UNLIKELY(role == QLightDM::UsersModel::SessionRole && variantData.toString().isEmpty())) {
+        variantData = Greeter::instance()->defaultSessionHint();
+    }
+
     return variantData;
 }
 
 
=== modified file 'po/unity8.pot'
--- po/unity8.pot	2017-03-28 21:50:21 +0000
+++ po/unity8.pot	2017-04-05 14:04:26 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-28 21:50+0000\n"
+"POT-Creation-Date: 2017-04-04 22:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -42,11 +42,11 @@
 msgid "Retry"
 msgstr ""
 
-#: plugins/LightDM/UsersModel.cpp:152
+#: plugins/LightDM/UsersModel.cpp:157
 msgid "Login"
 msgstr ""
 
-#: plugins/LightDM/UsersModel.cpp:160
+#: plugins/LightDM/UsersModel.cpp:165
 msgid "Guest Session"
 msgstr ""
 
@@ -521,15 +521,15 @@
 msgid "Passcode"
 msgstr ""
 
-#: qml/Greeter/SessionsList.qml:122
+#: qml/Greeter/SessionsList.qml:124
 msgid "Select desktop environment"
 msgstr ""
 
-#: qml/Launcher/Drawer.qml:93
+#: qml/Launcher/Drawer.qml:94
 msgid "Search…"
 msgstr ""
 
-#: qml/Launcher/Drawer.qml:128
+#: qml/Launcher/Drawer.qml:129
 msgctxt "Apps sorted alphabetically"
 msgid "A-Z"
 msgstr ""
 
=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2017-03-22 20:14:44 +0000
+++ qml/Greeter/Greeter.qml	2017-04-05 14:04:26 +0000
@@ -102,7 +102,7 @@
                 show();
                 d.startUnlock(false /* toTheRight */);
             }
-        } else if (appId !== "unity8-dash") { // dash isn't started by user
+        } else {
             d.startUnlock(false /* toTheRight */);
         }
     }
 
=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2017-01-24 07:40:40 +0000
+++ qml/Greeter/LoginList.qml	2017-04-05 14:04:26 +0000
@@ -35,7 +35,7 @@
     readonly property int cellHeight: units.gu(5)
     readonly property int highlightedHeight: highlightItem.height
     readonly property int moveDuration: UbuntuAnimation.FastDuration
-    property string currentSession
+    property string currentSession // Initially set by LightDM
     readonly property string currentUser: userList.currentItem.username
 
     signal responded(string response)
 
=== modified file 'qml/Greeter/SessionsList.qml'
--- qml/Greeter/SessionsList.qml	2016-12-19 19:55:07 +0000
+++ qml/Greeter/SessionsList.qml	2017-04-05 14:04:26 +0000
@@ -24,22 +24,24 @@
     id: root
     objectName: "sessionsList"
 
-    property string initiallySelectedSession
     signal sessionSelected(string sessionKey)
     signal showLoginList()
 
-    onInitiallySelectedSessionChanged: {
-        sessionsList.currentIndex = getSelectedIndex();
-        sessionsList.positionViewAtIndex(sessionsList.currentIndex, ListView.Contain);
+    // Sets the position of the background highlight
+    function updateHighlight(session) {
+        sessionsList.currentIndex = getIndexOfSession(session);
+        sessionsList.currentItem.initialSession = session;
     }
 
-    function getSelectedIndex() {
+    function getIndexOfSession(session) {
         for (var i = 0; i < sessionsList.model.count; i++) {
-            var key = sessionsList.model.get(i).key
-            if (key === initiallySelectedSession) {
+            var key = sessionsList.model.get(i).key;
+            if (key === session) {
                 return i;
             }
         }
+
+        return 0; // Just choose the first session
     }
 
     function currentKey() {
@@ -49,7 +51,8 @@
     }
 
     Keys.onEnterPressed: {
-        showLoginList(); // Session is already selected
+        sessionSelected(currentKey());
+        showLoginList();
         event.accepted = true;
     }
 
@@ -59,6 +62,7 @@
     }
 
     Keys.onReturnPressed: {
+        sessionSelected(currentKey());
         showLoginList();
         event.accepted = true;
     }
@@ -66,20 +70,18 @@
     Keys.onDownPressed: {
         if (sessionsList.currentIndex < sessionsList.model.count - 1)
             sessionsList.currentIndex++;
-        sessionSelected(currentKey());
         event.accepted = true;
     }
 
     Keys.onUpPressed: {
         if (sessionsList.currentIndex > 0)
             sessionsList.currentIndex--;
-        sessionSelected(currentKey());
         event.accepted = true;
     }
 
     LoginAreaContainer {
         readonly property real margins: sessionsList.anchors.margins
-        readonly property real prefferedHeight: {
+        readonly property real preferredHeight: {
             if (sessionsList.currentItem) {
                 return (sessionsList.currentItem.height *
                        (1 + sessionsList.model.count)) + 2 * margins
@@ -88,7 +90,7 @@
             }
         }
 
-        height: prefferedHeight < parent.height ? prefferedHeight : parent.height - units.gu(4)
+        height: preferredHeight < parent.height ? preferredHeight : parent.height - units.gu(4)
         width: parent.width
 
         anchors {
@@ -107,8 +109,8 @@
                 margins: units.gu(2)
             }
 
-            height: parent.height - headerItem.height
-
+            clip: true
+            height: parent.height - units.gu(2.5)
             boundsBehavior: Flickable.StopAtBounds
 
             model: LightDMService.sessions
@@ -135,14 +137,18 @@
             }
 
             headerPositioning: ListView.OverlayHeader
+
+            // The highlighting is all self-managed, so account for that
             highlightFollowsCurrentItem: false
+            highlight: QtObject {}
 
             delegate: ListItem {
                 id: delegate
                 objectName: "sessionDelegate" + index
 
+                property string initialSession: ""
+
                 divider.visible: false
-
                 visible: y > sessionsList.headerItem.y
                 + sessionsList.headerItem.height
                 - sessionsList.anchors.margins
@@ -157,6 +163,16 @@
                 }
 
                 Rectangle {
+                    id: backgroundHighlight
+
+                    height: sessionsList.currentItem.height
+                    width: sessionsList.currentItem.width
+                    color: theme.palette.normal.selection
+
+                    visible: initialSession === key && !!key
+                }
+
+                Rectangle {
                     height: parent.height
                     width: parent.width
                     color: "transparent"
@@ -171,15 +187,16 @@
                 ListItemLayout {
                     id: layout
 
+                    readonly property color itemColor: theme.palette.normal.raisedText
                     SessionIcon {
                         id: sessionIcon
                         source: icon_url
                         SlotsLayout.position: SlotsLayout.Leading
-                        color: theme.palette.normal.raisedSecondaryText
+                        color: parent.itemColor
                     }
 
                     title.text: display
-                    title.color: theme.palette.normal.raisedText
+                    title.color: itemColor
                 }
             }
         }
 
=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2017-03-22 20:14:44 +0000
+++ qml/Greeter/WideView.qml	2017-04-05 14:04:26 +0000
@@ -20,6 +20,8 @@
 
 FocusScope {
     id: root
+    objectName: "WideView"
+
     focus: true
 
     property alias background: coverPage.background
@@ -32,13 +34,13 @@
     property int delayMinutes // TODO
     property alias alphanumeric: loginList.alphanumeric
     property alias locked: loginList.locked
-    property alias sessionToStart: loginList.currentSession
     property alias waiting: loginList.waiting
     property var userModel // Set from outside
 
     readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
     readonly property bool fullyShown: coverPage.showProgress === 1
     readonly property bool required: coverPage.required
+    readonly property alias sessionToStart: loginList.currentSession
 
     // so that it can be replaced in tests with a mock object
     property var inputMethod: Qt.inputMethod
@@ -144,6 +146,7 @@
 
             height: loginList.height
             width: loginList.width
+
             anchors {
                 left: parent.left
                 leftMargin: Math.min(parent.width * 0.16, units.gu(20))
@@ -153,10 +156,9 @@
             active: false
 
             onLoaded: sessionChooserLoader.item.forceActiveFocus();
-            Binding {
-                target: sessionChooserLoader.item
-                property: "initiallySelectedSession"
-                value: loginList.currentSession
+            onActiveChanged: {
+                if (!active) return;
+                item.updateHighlight(loginList.currentSession);
             }
 
             Connections {
 
=== modified file 'qml/Launcher/Drawer.qml'
--- qml/Launcher/Drawer.qml	2017-03-24 11:51:31 +0000
+++ qml/Launcher/Drawer.qml	2017-04-05 14:04:26 +0000
@@ -28,6 +28,7 @@
     property int panelWidth: 0
     readonly property bool moving: listLoader.item && listLoader.item.moving
     readonly property Item searchTextField: searchField
+    readonly property real delegateWidth: units.gu(10)
 
     signal applicationSelected(string appId)
 
@@ -272,7 +273,7 @@
 
                             model: sortProxyModel
 
-                            delegateWidth: units.gu(8)
+                            delegateWidth: root.delegateWidth
                             delegateHeight: units.gu(10)
                             delegate: drawerDelegateComponent
                         }
@@ -332,7 +333,7 @@
                                 filterLetter: model.letter
                                 dynamicSortFilter: false
                             }
-                            delegateWidth: units.gu(8)
+                            delegateWidth: root.delegateWidth
                             delegateHeight: units.gu(10)
                             delegate: drawerDelegateComponent
                         }
@@ -352,6 +353,7 @@
                 readonly property bool focused: index === GridView.view.currentIndex && GridView.view.activeFocus
 
                 onClicked: root.applicationSelected(model.appId)
+                z: loader.active ? 1 : 0
 
                 Column {
                     width: units.gu(8)
@@ -384,11 +386,50 @@
                     }
 
                     Label {
+                        id: label
                         text: model.name
                         width: parent.width
                         horizontalAlignment: Text.AlignHCenter
                         fontSize: "small"
                         elide: Text.ElideRight
+
+                        Loader {
+                            id: loader
+                            x: {
+                                var aux = 0;
+                                if (item) {
+                                    aux = label.width / 2 - item.width / 2;
+                                    var containerXMap = mapToItem(contentContainer, aux, 0).x
+                                    if (containerXMap < 0) {
+                                        aux = aux - containerXMap;
+                                        containerXMap = 0;
+                                    }
+                                    if (containerXMap + item.width > contentContainer.width) {
+                                        aux = aux - (containerXMap + item.width - contentContainer.width);
+                                    }
+                                }
+                                return aux;
+                            }
+                            y: -units.gu(0.5)
+                            active: label.truncated && (drawerDelegate.hovered || drawerDelegate.focused)
+                            sourceComponent: Rectangle {
+                                color: UbuntuColors.jet
+                                width: fullLabel.contentWidth + units.gu(1)
+                                height: fullLabel.height + units.gu(1)
+                                radius: units.dp(4)
+                                Label {
+                                    id: fullLabel
+                                    width: Math.min(root.delegateWidth * 2, implicitWidth)
+                                    wrapMode: Text.Wrap
+                                    horizontalAlignment: Text.AlignHCenter
+                                    maximumLineCount: 3
+                                    elide: Text.ElideRight
+                                    anchors.centerIn: parent
+                                    text: model.name
+                                    fontSize: "small"
+                                }
+                            }
+                        }
                     }
                 }
             }
 
=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2017-03-21 10:54:59 +0000
+++ qml/Launcher/Launcher.qml	2017-04-05 14:04:26 +0000
@@ -75,7 +75,7 @@
         } else {
             superPressTimer.stop();
             superLongPressTimer.stop();
-            switchToNextState("");
+            switchToNextState(root.lockedVisible ? "visible" : "");
             panel.shortcutHintsShown = false;
         }
     }
@@ -88,7 +88,7 @@
             superPressTimer.stop();
             superLongPressTimer.stop();
         } else {
-            switchToNextState("");
+            switchToNextState(root.lockedVisible ? "visible" : "");
             root.focus = false;
             if (panel.highlightIndex == -1) {
                 root.showDashHome();
@@ -368,8 +368,11 @@
                 // Remove (and put back) the focus for the searchfield in
                 // order to hide the copy/paste popover when we move the drawer
                 var hadFocus = drawer.searchTextField.focus;
+                var oldSelectionStart = drawer.searchTextField.selectionStart;
+                var oldSelectionEnd = drawer.searchTextField.selectionEnd;
                 drawer.searchTextField.focus = false;
                 drawer.searchTextField.focus = hadFocus;
+                drawer.searchTextField.select(oldSelectionStart, oldSelectionEnd);
             }
         }
         width: Math.min(root.width, units.gu(90)) * .9
 
=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2017-03-21 10:55:52 +0000
+++ qml/Panel/Panel.qml	2017-04-05 14:04:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,15 +85,15 @@
         property bool showWindowDecorationControls: (revealControls && PanelState.decorationsVisible) ||
                                                     PanelState.decorationsAlwaysVisible
 
-        property bool showPointerMenu: revealControls &&
+        property bool showPointerMenu: revealControls && enablePointerMenu &&
                                        (PanelState.decorationsVisible || mode == "staged")
 
-        property bool enablePointerMenu: revealControls &&
-                                         applicationMenus.available &&
+        property bool enablePointerMenu: applicationMenus.available &&
                                          applicationMenus.model
 
         property bool showTouchMenu: !greeterShown &&
-                                     !showPointerMenu
+                                     !showPointerMenu &&
+                                     !showWindowDecorationControls
 
         property bool enableTouchMenus: showTouchMenu &&
                                         applicationMenus.available &&
@@ -211,7 +211,7 @@
                     opacity: d.showPointerMenu ? 1 : 0
                     visible: opacity != 0
                     Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
-                    active: __applicationMenus.model && !callHint.visible
+                    active: d.showPointerMenu && !callHint.visible
 
                     width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
 
@@ -220,7 +220,7 @@
                     sourceComponent: MenuBar {
                         id: bar
                         objectName: "menuBar"
-                        anchors.left: parent.left
+                        anchors.left: parent ? parent.left : undefined
                         anchors.margins: units.gu(1)
                         height: menuBarLoader.height
                         enableKeyFilter: valid && PanelState.decorationsVisible
@@ -339,7 +339,7 @@
             maximumLineCount: 1
             fontSize: "medium"
             font.weight: Font.Medium
-            color: Theme.palette.selected.backgroundText
+            color: theme.palette.selected.backgroundText
             opacity: __applicationMenus.visible && !__applicationMenus.expanded ? 1 : 0
             visible: opacity != 0
             Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-03-24 14:04:50 +0000
+++ qml/Shell.qml	2017-04-05 14:04:26 +0000
@@ -110,7 +110,7 @@
         }
     }
     function _onMainAppChanged(appId) {
-        if (wizard.active && appId != "" && appId != "unity8-dash") {
+        if (wizard.active && appId != "") {
             // If this happens on first boot, we may be in the
             // wizard while receiving a call.  But a call is more
             // important than the wizard so just bail out of it.
@@ -241,8 +241,7 @@
         onHomeKeyActivated: {
             // Ignore when greeter is active, to avoid pocket presses
             if (!greeter.active) {
-                launcher.fadeOut();
-                ApplicationManager.requestFocusApplication("unity8-dash");
+                launcher.openDrawer(false);
             }
         }
         onTouchBegun: { cursor.opacity = 0; }
 
=== modified file 'qml/Stage/ChildWindow.qml'
--- qml/Stage/ChildWindow.qml	2017-03-24 14:04:50 +0000
+++ qml/Stage/ChildWindow.qml	2017-04-05 14:04:26 +0000
@@ -104,10 +104,6 @@
                 height: root.decorationHeight
                 title: root.surface ? root.surface.name : ""
                 active: root.surface ? root.surface.focused : false
-                closeButtonVisible: root.surface ? root.surface.type === Mir.SatelliteType
-                                                || root.surface.type === Mir.NormalType
-                                                || root.surface.type === Mir.UtilityType
-                                                 : false
                 minimizeButtonVisible: false
                 maximizeButtonShown: false
                 onPressed: root.surface.activate();
 
=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2017-03-24 14:04:50 +0000
+++ qml/Stage/DecoratedWindow.qml	2017-04-05 14:04:26 +0000
@@ -38,6 +38,7 @@
     property alias maximizeButtonShown: decoration.maximizeButtonShown
     property alias interactive: applicationWindow.interactive
     readonly property alias orientationChangesEnabled: applicationWindow.orientationChangesEnabled
+    property alias windowControlButtonsVisible: decoration.windowControlButtonsVisible
 
     // Changing this will actually add/remove a decoration, meaning, requestedHeight will take the decoration into account.
     property bool hasDecoration: true
@@ -210,7 +211,7 @@
 
     WindowDecoration {
         id: decoration
-        closeButtonVisible: root.application.appId !== "unity8-dash"
+        closeButtonVisible: true
         objectName: "appWindowDecoration"
 
         anchors { left: parent.left; top: parent.top; right: parent.right }
 
=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-03-28 21:46:37 +0000
+++ qml/Stage/Stage.qml	2017-04-05 14:04:26 +0000
@@ -91,6 +91,7 @@
 
 
     onAltTabPressedChanged: {
+        root.focus = true;
         if (altTabPressed) {
             if (root.spreadEnabled) {
                 altTabDelayTimer.start();
@@ -171,7 +172,7 @@
         id: closeFocusedShortcut
         shortcut: Qt.AltModifier|Qt.Key_F4
         onTriggered: {
-            if (priv.focusedAppDelegate && !priv.focusedAppDelegate.isDash) {
+            if (priv.focusedAppDelegate) {
                 priv.focusedAppDelegate.close();
             }
         }
@@ -390,7 +391,7 @@
     Binding {
         target: PanelState
         property: "decorationsVisible"
-        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus
+        value: mode == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && !root.spreadShown
     }
 
     Binding {
@@ -431,7 +432,7 @@
     Binding {
         target: PanelState
         property: "closeButtonShown"
-        value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && !priv.focusedAppDelegate.isDash
+        value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized
     }
 
     Component.onDestruction: {
@@ -477,6 +478,7 @@
         State {
             name: "spread"; when: priv.goneToSpread
             PropertyChanges { target: floatingFlickable; enabled: true }
+            PropertyChanges { target: root; focus: true }
             PropertyChanges { target: spreadItem; focus: true }
             PropertyChanges { target: hoverMouseArea; enabled: true }
             PropertyChanges { target: rightEdgeDragArea; enabled: false }
@@ -516,14 +518,20 @@
         State {
             name: "staged"; when: root.mode === "staged"
             PropertyChanges { target: wallpaper; visible: !priv.focusedAppDelegate || priv.focusedAppDelegate.x !== 0 }
+            PropertyChanges { target: root; focus: true }
+            PropertyChanges { target: appContainer; focus: true }
         },
         State {
             name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
             PropertyChanges { target: triGestureArea; enabled: priv.sideStageEnabled }
             PropertyChanges { target: sideStage; visible: true }
+            PropertyChanges { target: root; focus: true }
+            PropertyChanges { target: appContainer; focus: true }
         },
         State {
             name: "windowed"; when: root.mode === "windowed"
+            PropertyChanges { target: root; focus: true }
+            PropertyChanges { target: appContainer; focus: true }
         }
     ]
     transitions: [
@@ -606,9 +614,7 @@
             }
 
             onCloseCurrentApp: {
-                if (!appRepeater.itemAt(highlightedIndex).isDash) {
-                    appRepeater.itemAt(highlightedIndex).close();
-                }
+                appRepeater.itemAt(highlightedIndex).close();
             }
         }
 
@@ -1380,11 +1386,11 @@
                             requestedX: root.availableDesktopArea.x;
                             requestedY: 0;
                             visuallyMinimized: false;
-                            visuallyMaximized: true
                             requestedWidth: root.availableDesktopArea.width;
                             requestedHeight: appContainer.height;
                         }
                         PropertyChanges { target: touchControls; enabled: true }
+                        PropertyChanges { target: decoratedWindow; windowControlButtonsVisible: false }
                     },
                     State {
                         name: "fullscreen"; when: appDelegate.fullscreen && !appDelegate.minimized
@@ -1403,11 +1409,10 @@
                         PropertyChanges {
                             target: appDelegate
                             visuallyMinimized: false
-                            visuallyMaximized: false
                         }
                         PropertyChanges { target: touchControls; enabled: true }
                         PropertyChanges { target: resizeArea; enabled: true }
-                        PropertyChanges { target: decoratedWindow; shadowOpacity: .3}
+                        PropertyChanges { target: decoratedWindow; shadowOpacity: .3; windowControlButtonsVisible: true}
                     },
                     State {
                         name: "restored";
@@ -1596,11 +1601,18 @@
                         to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
                         enabled: appDelegate.animationsEnabled
                         SequentialAnimation {
+                            ScriptAction { script: {
+                                    if (appDelegate.visuallyMaximized) visuallyMaximized = false; // maximized before -> going to restored
+                                }
+                            }
                             PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                             UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";
                                 duration: priv.animationDuration }
-                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
-                            ScriptAction { script: { fakeRectangle.stop(); } }
+                            ScriptAction { script: {
+                                    fakeRectangle.stop();
+                                    appDelegate.visuallyMaximized = appDelegate.maximized; // reflect the target state
+                                }
+                            }
                         }
                     }
                 ]
@@ -1741,7 +1753,7 @@
                     objectName: "dragArea"
                     anchors.fill: decoratedWindow
                     enabled: false
-                    closeable: !appDelegate.isDash
+                    closeable: true
 
                     onClicked: {
                         spreadItem.highlightedIndex = index;
@@ -1784,7 +1796,7 @@
                     objectName: "closeMouseArea"
                     anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset }
                     readonly property var mousePos: hoverMouseArea.mapToItem(appDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
-                    visible: !appDelegate.isDash && dragArea.distance == 0
+                    visible: dragArea.distance == 0
                              && index == spreadItem.highlightedIndex
                              && mousePos.y < (decoratedWindow.height / 3)
                              && mousePos.y > -units.gu(4)
 
=== modified file 'qml/Stage/WindowDecoration.qml'
--- qml/Stage/WindowDecoration.qml	2017-03-01 12:18:59 +0000
+++ qml/Stage/WindowDecoration.qml	2017-04-05 14:04:26 +0000
@@ -34,6 +34,7 @@
     property var menu: undefined
     property bool enableMenus: true
     property bool windowMoving: false
+    property alias windowControlButtonsVisible: buttons.visible
 
     readonly property real buttonsWidth: buttons.width + row.spacing
 
 
=== modified file 'qml/Tutorial/TutorialContent.qml'
--- qml/Tutorial/TutorialContent.qml	2016-05-19 17:23:12 +0000
+++ qml/Tutorial/TutorialContent.qml	2017-04-05 14:04:26 +0000
@@ -153,8 +153,7 @@
             paused: root.paused
 
             skipped: tutorialLeftLongLoader.skipped
-            isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed &&
-                     ApplicationManager.focusedApplicationId != "unity8-dash"
+            isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed
 
             InactivityTimer {
                 id: tutorialLeftLongTimer
 
=== modified file 'tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp'
--- tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-01-16 11:12:00 +0000
+++ tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-04-05 14:04:26 +0000
@@ -46,7 +46,7 @@
     m_list.append(item);
     item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);
     m_list.append(item);
-    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office", "libreoffice", this);
+    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office Writer", "libreoffice", this);
     m_list.append(item);
 
     qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
 
=== modified file 'tests/mocks/liblightdm/MockUsersModel.cpp'
--- tests/mocks/liblightdm/MockUsersModel.cpp	2017-01-19 20:12:34 +0000
+++ tests/mocks/liblightdm/MockUsersModel.cpp	2017-04-05 14:04:26 +0000
@@ -186,6 +186,7 @@
             { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
             { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
             { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
+            { "no-session",        "No Session", 0, 0, false, false, "", 0 },
             { "question-prompt",   "Question Prompt", 0, 0, false, false, "ubuntu", 0 },
             { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
             { "two-prompts",       "Two Prompts", 0, 0, false, false, "ubuntu", 0 },
 
=== modified file 'tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp	2017-01-19 15:25:53 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp	2017-04-05 14:04:26 +0000
@@ -113,6 +113,19 @@
         QCOMPARE(session, Greeter::instance()->defaultSessionHint());
     }
 
+
+    void testEmptySession()
+    {
+        int i = findName(model, QStringLiteral("no-session"));
+        QVERIFY(i >= 0);
+
+        // A valid test as 'no-session' is instantiated with it's
+        // SessionRole as an empty string. This ensures something,
+        // hopefully sensical, is returned.
+        auto session = model->data(i, QLightDM::UsersModel::SessionRole);
+        QCOMPARE(session.toString().isEmpty(), false);
+    }
+
     void testHideUsers()
     {
         QLightDM::MockController::instance()->setHideUsersHint(true);
 
=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2017-02-28 16:49:40 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2017-04-05 14:04:26 +0000
@@ -395,6 +395,20 @@
             waitForRendering(view);
         }
 
+        function test_sessionless_user_is_still_valid() {
+            var loginList = findChild(view, "loginList")
+
+            /*
+             * If a user has never logged in before, or, for some reason
+             * has no sessionHint, ensure that the model returns the default
+             * session and that the view respects this
+             */
+            selectUser("no-session");
+            compare(LightDM.Users.data(loginList.currentIndex, LightDM.UserRoles.SessionRole), LightDM.Greeter.defaultSession);
+
+            tryCompare(loginList, "currentSession", LightDM.Greeter.defaultSession);
+        }
+
         function test_changingSessionSticksToUser() {
             var loginList = findChild(view, "loginList");
 
@@ -426,7 +440,8 @@
             var sessionChooserButton = findChild(view, "sessionChooserButton");
             compare(sessionChooserButton.visible, true);
 
-            var session = String(view.sessionToStart).toLowerCase();
+            var loginList = findChild(view, "loginList");
+            var session = String(loginList.currentSession).toLowerCase();
             var icon = String(sessionChooserButton.icon);
             compare(icon.indexOf(session) > -1, true);
 
 
=== modified file 'tests/qmltests/Launcher/tst_Drawer.qml'
--- tests/qmltests/Launcher/tst_Drawer.qml	2017-03-13 14:52:26 +0000
+++ tests/qmltests/Launcher/tst_Drawer.qml	2017-04-05 14:04:26 +0000
@@ -271,8 +271,22 @@
 
             var searchField = findChild(drawer, "searchField");
             tryCompareFunction(function() { return !!searchField }, true);
+            tryCompare(searchField, "selectedText", searchField.displayText);
             typeString("cam");
             tryCompareFunction(function() { return searchField.displayText }, "cam");
+
+            // Try again to make sure it cleaned and everything
+            keyClick(Qt.Key_Escape);
+            waitForRendering(launcher);
+            waitUntilTransitionsEnd(launcher);
+            launcher.openDrawer(true);
+            waitForRendering(launcher);
+            waitUntilTransitionsEnd(launcher);
+
+            tryCompare(searchField, "selectedText", searchField.displayText);
+            typeString("terminal");
+            tryCompareFunction(function() { return searchField.displayText }, "terminal");
+
         }
 
         function test_kbdNavigation() {
 
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2017-03-24 08:27:54 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2017-04-05 14:04:26 +0000
@@ -1543,6 +1543,18 @@
             launcher.panelWidth = oldSize;
         }
 
+        function test_doesntHideOnSuperWhenLockedVisible() {
+            launcher.lockedVisible = true;
+
+            waitForRendering(launcher);
+            launcher.superPressed = true;
+            wait(400); // Longpress
+            launcher.superPressed = false;
+            waitForRendering(launcher);
+
+            verify(launcher.state, "visible");
+        }
+
         function test_mouseHoverSelectQuickList() {
             dragLauncherIntoView();
             var clickedItem = findChild(launcher, "launcherDelegate5")
 
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2017-03-17 13:44:30 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2017-04-05 14:04:26 +0000
@@ -779,40 +779,18 @@
 
             var appTitle = findChild(panel, "panelTitle"); verify(appTitle);
             var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
-            var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
+            var menuBarLoader = findChild(panel, "menuBarLoader"); verify(menuBarLoader);
 
             tryCompare(appTitle, "visible", true, undefined, "App title should be visible");
-            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
+            tryCompare(menuBarLoader, "visible", false, undefined, "App menu bar should not be visible");
 
             mouseMove(panel, panel.width/2, panel.panelHeight);
 
+            var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
             tryCompare(appTitle, "visible", false, undefined, "App title should not be visible on mouse hover");
             tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover");
         }
 
-        function test_windowedApplicationMenuShowOnMouseHoverWhenDecorationsShown() {
-            PanelState.title = "Fake Title";
-            panel.mode = "windowed";
-            mouseEmulation.checked = false;
-
-            var appTitle = findChild(panel, "panelTitle"); verify(appTitle);
-            var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
-            var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
-
-            tryCompare(appTitle, "visible", true, undefined, "App title should be visible");
-            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
-
-            mouseMove(panel, panel.width/2, panel.panelHeight);
-
-            tryCompare(appTitle, "visible", true, undefined, "App title should still be visible on mouse hover when panel decorations are not visible");
-            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should be visible on mouse hover when panel decorations are not visible");
-
-            PanelState.decorationsVisible = true;
-
-            tryCompare(appTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
-            tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover when panel decorations not visible");
-        }
-
         function test_keyboardNavigation_data() {
             return [
                 {tag: "tab to start", doTab: false},
 
=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2017-03-24 14:04:50 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-04-05 14:04:26 +0000
@@ -693,13 +693,6 @@
             tryCompare(facebookAppDelegate, "maximized", true);
         }
 
-        function test_dashHasNoCloseButton() {
-            var dashAppDelegate = startApplication("unity8-dash");
-            verify(dashAppDelegate);
-            var closeButton = findChild(dashAppDelegate, "closeWindowButton");
-            tryCompare(closeButton, "visible", false);
-        }
-
         function test_hideMaximizeButtonWhenSizeConstrained() {
             var dialerDelegate = startApplication("dialer-app");
 
@@ -870,11 +863,7 @@
             maximizeAppDelegate(appDelegate);
 
             // Close the window and restart the application
-            var closeButton = findChild(appDelegate, "closeWindowButton");
-            appDelegate = null;
-            verify(closeButton);
-            mouseClick(closeButton);
-            closeButton = null;
+            appDelegate.close();
             tryCompare(topSurfaceList, "count", originalWindowCount);
             wait(100); // plus some spare room
             appDelegate = startApplication("dialer-app");
 
=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-03-24 11:08:11 +0000
+++ tests/qmltests/tst_Shell.qml	2017-04-05 14:04:26 +0000
@@ -138,9 +138,6 @@
                     }
                     mode: shellLoader.mode
                     hasTouchscreen: true
-                    Component.onCompleted: {
-                        ApplicationManager.startApplication("unity8-dash");
-                    }
                     Component.onDestruction: {
                         shellLoader.itemDestroyed = true;
                     }
@@ -601,10 +598,6 @@
             topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
             verify(topLevelSurfaceList);
             stage = findChild(shell, "stage");
-
-            // wait until unity8-dash is fully loaded
-            tryCompare(topLevelSurfaceList, "count", 1);
-            waitUntilAppWindowIsFullyLoaded(topLevelSurfaceList.idAt(0));
         }
 
         function loadDesktopShellWithApps() {
@@ -612,6 +605,7 @@
             waitForRendering(shell)
             shell.usageScenario = "desktop"
             waitForRendering(shell)
+            var app0 = ApplicationManager.startApplication("unity8-dash")
             var app1 = ApplicationManager.startApplication("dialer-app")
             var app2 = ApplicationManager.startApplication("webbrowser-app")
             var app3 = ApplicationManager.startApplication("camera-app")
@@ -794,8 +788,37 @@
             tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
         }
 
+        function test_greeterStartsCorrectSession() {
+            loadShell("desktop");
+            setLightDMMockMode("full");
+
+            LightDMController.sessionMode = "full"
+            LightDMController.numSessions = LightDMController.numAvailableSessions;
+            var greeter = findChild(shell, "greeter");
+            var view = findChild(greeter, "WideView");
+            verify(view, "This test requires WideView to be loaded");
+
+            var loginList = findChild(view, "loginList");
+
+            compare(view.sessionToStart, greeter.sessionToStart());
+
+            // Ensure another session can actually be selected
+            compare(LightDMController.numSessions > 1, true);
+            loginList.currentSession = LightDM.Sessions.data(1, LightDM.SessionRoles.KeyRole);
+
+            compare(view.sessionToStart, greeter.sessionToStart());
+
+        }
+
+
         function swipeAwayGreeter() {
             var greeter = findChild(shell, "greeter");
+
+            if (!greeter.shown) {
+                console.log("Greeter not shown. Not swiping.");
+                return;
+            }
+
             tryCompare(greeter, "fullyShown", true);
             waitForGreeterToStabilize();
             removeTimeConstraintsFromSwipeAreas(greeter);
@@ -1222,26 +1245,11 @@
 
             var wizard = findChild(shell, "wizard");
             tryCompare(wizard, "active", true);
-            tryCompareFunction(function() { return topLevelSurfaceList.applicationAt(0).appId; }, "unity8-dash");
-
-            // Make sure we stay running when there's no top level window (can happen for
-            // a moment when we restart the dash after switching language)
-            var dashApplication = ApplicationManager.findApplication("unity8-dash");
-            ApplicationManager.stopApplication(dashApplication.appId);
-            // wait until all zombie surfaces are gone. As MirSurfaceItems hold references over them.
-            // They won't be gone until those surface items are destroyed.
-            tryCompareFunction(function() { return dashApplication.surfaceList.count }, 0);
 
             tryCompare(topLevelSurfaceList, "count", 0);
             compare(wizard.shown, true);
 
-            // And make sure we stay running when dash comes back again
-            var dashSurfaceId = topLevelSurfaceList.nextId;
-            ApplicationManager.startApplication(dashApplication.appId);
-            waitUntilAppWindowIsFullyLoaded(dashSurfaceId);
-            compare(wizard.shown, true);
-
-            // And make sure we stop when some other surface shows app
+            // And make sure we stop when some surface shows app
             var gallerySurfaceId = topLevelSurfaceList.nextId;
             var galleryApp = ApplicationManager.startApplication("gallery-app");
             waitUntilAppWindowIsFullyLoaded(gallerySurfaceId);
@@ -1291,6 +1299,11 @@
         function test_tapOnRightEdgeReachesApplicationSurface() {
             loadShell("phone");
             swipeAwayGreeter();
+
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
             var topmostSpreadDelegate = findChild(shell, "appDelegate_" + topLevelSurfaceList.idAt(0));
             verify(topmostSpreadDelegate);
 
@@ -1320,6 +1333,11 @@
         function test_rightEdgeDragDoesNotReachApplicationSurface() {
             loadShell("phone");
             swipeAwayGreeter();
+
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
             var topmostSpreadDelegate = findChild(shell, "appDelegate_" + topLevelSurfaceList.idAt(0));
             var topmostSurfaceItem = findChild(topmostSpreadDelegate, "surfaceItem");
             var rightEdgeDragArea = findChild(shell, "rightEdgeDragArea");
@@ -1372,15 +1390,15 @@
             verify(coverPage.shown);
         }
 
-        function test_physicalHomeKeyPressFocusesDash() {
+        function test_physicalHomeKeyPressOpensDrawer() {
             loadShell("phone");
-
-            var galleryApp = ApplicationManager.startApplication("gallery-app");
-            tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");
+            swipeAwayGreeter();
 
             var windowInputMonitor = findInvisibleChild(shell, "windowInputMonitor");
             windowInputMonitor.homeKeyActivated();
-            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+
+            var launcher = findChild(shell, "launcher");
+            tryCompare(launcher, "drawerShown", true);
         }
 
         function test_tabletLogin_data() {
@@ -1499,6 +1517,10 @@
             loadShell("tablet");
             shell.usageScenario = "desktop";
 
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
             var webBrowserSurfaceId = topLevelSurfaceList.nextId;
             var webBrowserApp = ApplicationManager.startApplication("webbrowser-app");
             waitUntilAppWindowIsFullyLoaded(webBrowserSurfaceId);
@@ -1523,6 +1545,10 @@
             loadShell("tablet");
             shell.usageScenario = "tablet";
 
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
             var webBrowserSurfaceId = topLevelSurfaceList.nextId;
             var webBrowserApp = ApplicationManager.startApplication("webbrowser-app");
             waitUntilAppWindowIsFullyLoaded(webBrowserSurfaceId);
@@ -2415,7 +2441,7 @@
 
             tryCompare(broadcastUrlSpy, "count", 1);
             compare(broadcastUrlSpy.signalArguments[0][0], "application:///" + appIcon.appId + ".desktop");
-            compare(ApplicationManager.count, 1); // confirm only dash is open, we didn't start new app
+            compare(ApplicationManager.count, 0); // confirm no app is open, we didn't start new app
 
             var coverPage = findChild(shell, "coverPage");
             tryCompare(coverPage, "showProgress", 0);
@@ -2456,7 +2482,7 @@
 
             tryCompare(broadcastUrlSpy, "count", 1);
             compare(broadcastUrlSpy.signalArguments[0][0], "test:");
-            compare(ApplicationManager.count, 1); // confirm only dash is open, we didn't start new app
+            compare(ApplicationManager.count, 0); // confirm no app is open, we didn't start new app
 
             var coverPage = findChild(shell, "coverPage");
             tryCompare(coverPage, "showProgress", 0);
@@ -2685,6 +2711,10 @@
             ensureInputMethodSurface();
             shell.oskEnabled = data.oskEnabled;
 
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
             var oldOSKState = topLevelSurfaceList.inputMethodSurface.state;
             topLevelSurfaceList.inputMethodSurface.requestState(Mir.RestoredState);
             var appRepeater = findChild(shell, "appRepeater");
@@ -2957,7 +2987,11 @@
             swipeAwayGreeter();
 
             var appSurfaceId = topLevelSurfaceList.nextId;
-            var app = ApplicationManager.startApplication("dialer-app")
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
+            appSurfaceId = topLevelSurfaceList.nextId;
+            app = ApplicationManager.startApplication("dialer-app")
             waitUntilAppWindowIsFullyLoaded(appSurfaceId);
 
             appSurfaceId = topLevelSurfaceList.nextId;
@@ -2984,12 +3018,6 @@
             // Now the dash should be highlighted
             tryCompareFunction(function() {return appRepeater.itemAt(spread.highlightedIndex).appId == "unity8-dash"}, true);
 
-            keyClick(Qt.Key_Q);
-
-            // Dash is not closeable, should still be 2
-            tryCompare(ApplicationManager, "count", 2);
-
-            // Move to the next one, should be closable again
             keyClick(Qt.Key_Tab);
             tryCompareFunction(function() {return appRepeater.itemAt(spread.highlightedIndex).appId == "calendar-app"}, true);
 
@@ -3170,6 +3198,96 @@
             tryCompare(menuBarLoader.item, "visible", true);
         }
 
+        function test_enforceFocusOnStageOnAltTab() {
+            loadShell("desktop");
+            shell.usageScenario = "desktop";
+            waitForRendering(shell);
+            swipeAwayGreeter();
+
+            var appSurfaceId = topLevelSurfaceList.nextId;
+            var app = ApplicationManager.startApplication("unity8-dash")
+            waitUntilAppWindowIsFullyLoaded(appSurfaceId);
+
+            var appDelegate = startApplication("music-app")
+            verify(appDelegate);
+            waitForRendering(shell);
+
+            var launcher = findChild(shell, "launcher");
+            launcher.focus = true;
+
+            var stage = findChild(shell, "stage");
+
+            var spreadItem = findChild(shell, "spreadItem");
+
+            compare(spreadItem.highlightedIndex, -1);
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+
+            tryCompare(spreadItem, "highlightedIndex", 1);
+            tryCompare(stage, "focus", true);
+
+            keyClick(Qt.Key_Tab);
+
+            tryCompare(spreadItem, "highlightedIndex", 0);
+
+            keyRelease(Qt.Key_Alt);
+        }
+
+        function test_maximizedWindowMenuThenAltTab_data() {
+            return [
+                { tag: "show spread", showSpread: true },
+                { tag: "do not show spread", showSpread: false },
+            ];
+        }
+
+        function test_maximizedWindowMenuThenAltTab(data) {
+            loadShell("desktop");
+            shell.usageScenario = "desktop";
+            waitForRendering(shell);
+            swipeAwayGreeter();
+
+            var appDelegate = startApplication("gmail-webapp");
+            var appDelegate2 = startApplication("dialer-app");
+
+            tryCompare(appDelegate2.surface, "activeFocus", true);
+
+            var maximizeButton = findChild(appDelegate2, "maximizeWindowButton");
+            mouseClick(maximizeButton);
+            tryCompare(appDelegate2, "state", "maximized");
+
+            var panel = findChild(shell, "panel");
+            var panelMouse = findChild(panel, "windowControlArea");
+            mouseMove(panelMouse);
+            var panelMenu = findChild(panel, "menuBar");
+            var menuBarLoader = findChild(panel, "menuBarLoader");
+            mouseMove(panelMenu);
+            var panelMenuItem = findChild(panelMenu, "menuBar-item0");
+            tryCompare(panelMenuItem, "visible", true);
+            Util.waitForBehaviors(shell);
+            mouseClick(panelMenuItem);
+            var panelMenuItemItem = findChild(panelMenu, "menuBar-item0-menu-item0-actionItem");
+            mouseMove(panelMenuItemItem, panelMenuItemItem.width/2, panelMenuItemItem.height/2);
+            verify(panelMenuItemItem.activeFocus);
+            verify(panelMenuItem.__popup);
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+            if (data.showSpread) {
+                tryCompare(stage, "spreadShown", true);
+            }
+            tryCompareFunction(function() { return menuBarLoader.active === false; }, true);
+            keyRelease(Qt.Key_Alt)
+
+            tryCompare(appDelegate.surface, "activeFocus", true);
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+            keyRelease(Qt.Key_Alt)
+
+            tryCompare(appDelegate2.surface, "activeFocus", true);
+        }
+
         function test_maximizedWindowAndMenuInPanel() {
             loadShell("desktop");
             shell.usageScenario = "desktop";