Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose

src/com/android/launcher3/Launcher.java

@@ -497,7 +497,7 @@ public class Launcher extends Activity
      * ensure the custom content page is added or removed if necessary.
      */
     protected void invalidateHasCustomContentToLeft() {
-        if (mWorkspace.getScreenOrder().isEmpty()) {
+        if (mWorkspace == null || mWorkspace.getScreenOrder().isEmpty()) {
             // Not bound yet, wait for bindScreens to be called.
             return;
         }