Trying to get onShow in all the right places

Change-Id: I875ecc160640a425026b1a8dc8ca2d48ae172a22
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ada41a0..87840a7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1023,6 +1023,12 @@
             stripEmptyScreens();
             mStripScreensOnPageStopMoving = false;
         }
+    }
+
+    @Override
+    protected void notifyPageSwitchListener() {
+        super.notifyPageSwitchListener();
+        Launcher.setScreen(mCurrentPage);
 
         if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) {
             mCustomContentShowing = true;
@@ -1037,12 +1043,6 @@
                 mLauncher.resetQSBScroll();
             }
         }
-    }
-
-    @Override
-    protected void notifyPageSwitchListener() {
-        super.notifyPageSwitchListener();
-        Launcher.setScreen(mCurrentPage);
     };
 
     protected void setWallpaperDimension() {