workloads/gfxbench: Swtich to the home screen before run

Alter the element to check popups have closed to be present
on any main screen and ensure we switch to the homescreen of the
app before performing setup steps.

Author: marcbonnici

wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk

@@ -57,6 +57,12 @@ public void setup() throws Exception{
         setScreenOrientation(ScreenOrientation.NATURAL);
         clearFirstRun();
 
+        // Ensure we're on the home screen
+        UiObject homeButton = mDevice.findObject(
+                new UiSelector().resourceId(packageID + "tabbar_back"))
+                                .getChild(new UiSelector().index(0));
+        homeButton.click();
+
         //Calculate the location of the test selection button
         UiObject circle =
             mDevice.findObject(new UiSelector().resourceId(packageID + "main_circleControl")
@@ -122,7 +128,7 @@ public void clearFirstRun() throws Exception {
         }
 
         UiObject home =
-            mDevice.findObject(new UiSelector().resourceId(packageID + "main_homeBack")
+            mDevice.findObject(new UiSelector().resourceId(packageID + "main_view_back")
                 .className("android.widget.LinearLayout"));
             home.waitForExists(300000);
     }