@@ -251,6 +251,21 @@ Rectangle {
251251
252252 var launcher = findChild(shell, "launcher");
253253 launcherShowDashHomeSpy.target = launcher;
254+
255+ waitForGreeterToStabilize();
256+ }
257+
258+ function waitForGreeterToStabilize() {
259+ var greeter = findChild(shell, "greeter");
260+ verify(greeter);
261+
262+ var loginList = findChild(greeter, "loginList");
263+ // Only present in WideView
264+ if (loginList) {
265+ var userList = findChild(loginList, "userList");
266+ verify(userList);
267+ tryCompare(userList, "movingInternally", false);
268+ }
254269 }
255270
256271 function tearDown() {
@@ -674,6 +689,7 @@ Rectangle {
674689 function test_launchedAppHasActiveFocus(data) {
675690 loadShell(data.formFactor);
676691 swipeAwayGreeter();
692+
677693 var dialerApp = ApplicationManager.startApplication("webbrowser-app");
678694 verify(dialerApp);
679695 waitUntilAppSurfaceShowsUp("webbrowser-app")
@@ -683,18 +699,6 @@ Rectangle {
683699 tryCompare(dialerApp.session.surface, "activeFocus", true);
684700 }
685701
686− // Wait for the whole UI to settle down
687− function waitForUIToSettle() {
688− var launcher = findChild(shell, "launcherPanel")
689− tryCompareFunction(function() {return launcher.x === 0 || launcher.x === -launcher.width;}, true);
690− if (launcher.x === 0) {
691− mouseClick(shell)
692− }
693− tryCompare(launcher, "x", -launcher.width)
694−
695− waitForRendering(shell)
696− }
697−
698702 function waitUntilAppSurfaceShowsUp(appId) {
699703 var appWindow = findChild(shell, "appWindow_" + appId);
700704 verify(appWindow);