Merge "Fix NPE when launching fullscreen app during split screen mode" into tm-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

@@ -1718,8 +1718,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
             logExitToStage(dismissReason, toStage == STAGE_TYPE_MAIN);
         }
 
-        addDividerBarToTransition(info, t, false /* show */);
-
         // Hide divider and dim layer on transition finished.
         setDividerVisibility(false, finishT);
         finishT.hide(mMainStage.mDimLayer);
@@ -1741,6 +1739,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
             return false;
         }
 
+        addDividerBarToTransition(info, t, false /* show */);
         return true;
     }