Merge "Fix dead surface/window left on screen" into nyc-dev

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

@@ -4258,7 +4258,6 @@ public class WindowManagerService extends IWindowManager.Stub
                                     WindowManagerPolicy.TRANSIT_EXIT);
                         }
                     }
-                    win.mAnimatingExit = true;
                     changed = true;
                     win.setDisplayLayoutNeeded();
                 }

services/core/java/com/android/server/wm/WindowSurfaceController.java

@@ -100,6 +100,8 @@ class WindowSurfaceController {
     void hideInTransaction(String reason) {
         if (SHOW_TRANSACTIONS) logSurface("HIDE ( " + reason + " )", null);
         mHiddenForOtherReasons = true;
+
+        mAnimator.destroyPreservedSurfaceLocked();
         updateVisibility();
     }
 
@@ -180,6 +182,7 @@ class WindowSurfaceController {
                 updateVisibility();
             } else {
                 mHiddenForCrop = true;
+                mAnimator.destroyPreservedSurfaceLocked();
                 updateVisibility();
             }
         } catch (RuntimeException e) {