Merge "Fix dialog exit animation" into tm-dev

core/java/android/view/ViewRootImpl.java

@@ -3448,6 +3448,12 @@ public final class ViewRootImpl implements ViewParent,
                     mReportNextDraw = false;
                     pendingDrawFinished();
                 }
+
+                // Make sure the consumer is not waiting if the view root was just made invisible.
+                if (mBLASTDrawConsumer != null) {
+                    mBLASTDrawConsumer.accept(null);
+                    mBLASTDrawConsumer = null;
+                }
             }
         }