Merge "Fix black screen on app transition."

Author: Craig Mautner

services/java/com/android/server/wm/WindowManagerService.java

@@ -7688,9 +7688,9 @@ private void animateAndUpdateSurfaces(final long currentTime, final int dw, fina
         Surface.openTransaction();
 
         try {
+            updateWindowsAppsAndRotationAnimationsLocked(currentTime, innerDw, innerDh);
             mPendingLayoutChanges = performAnimationsLocked(currentTime, dw, dh,
                     innerDw, innerDh);
-            updateWindowsAppsAndRotationAnimationsLocked(currentTime, innerDw, innerDh);
 
             // THIRD LOOP: Update the surfaces of all windows.