Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf

src/com/android/launcher3/Workspace.java

@@ -2336,7 +2336,9 @@ public class Workspace extends SmoothPagedView
     void hideCustomContentIfNecessary() {
         boolean hide  = mState != Workspace.State.NORMAL;
         if (hide && hasCustomContent()) {
+            disableLayoutTransitions();
             mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
+            enableLayoutTransitions();
         }
     }