Merge "Moving launcher state verification higher." into sc-v2-dev am: 6f20ec39dc am: e016a3c279

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15288953

Change-Id: I4ed361ecfd4d96c2b0a6e48c00e8d0282a7c3f1b

tests/tapl/com/android/launcher3/tapl/AllApps.java

@@ -135,6 +135,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
                                         .collect(Collectors.toList()),
                                 mLauncher.getVisibleBounds(searchBox).bottom
                                         - mLauncher.getVisibleBounds(allAppsContainer).top);
+                        verifyActiveContainer();
                         final int newScroll = getAllAppsScroll();
                         mLauncher.assertTrue(
                                 "Scrolled in a wrong direction in AllApps: from " + scroll + " to "
@@ -144,7 +145,6 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
                         mLauncher.assertTrue(
                                 "Exceeded max scroll attempts: " + MAX_SCROLL_ATTEMPTS,
                                 ++attempts <= MAX_SCROLL_ATTEMPTS);
-                        verifyActiveContainer();
                         scroll = newScroll;
                     }
                 }