diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index bb12a573b5d68..fa1d24961ddae 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9362,7 +9362,6 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
 
         if (mAttachInfo != null) {
             mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_MSG, this);
-            mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_RECT_MSG, this);
         }
 
         mCurrentAnimation = null;
@@ -13910,6 +13909,7 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
                         }
 
                         public void onReleased(InvalidateInfo element) {
+                            element.target = null;
                         }
                     }, POOL_LIMIT)
             );