Merge "Better handling of confused finish transition." into nyc-dev

core/java/android/app/ActivityTransitionState.java

@@ -284,7 +284,7 @@ class ActivityTransitionState {
     }
 
     public boolean startExitBackTransition(final Activity activity) {
-        if (mEnteringNames == null) {
+        if (mEnteringNames == null || mCalledExitCoordinator != null) {
             return false;
         } else {
             if (!mHasExited) {

core/java/android/app/EnterTransitionCoordinator.java

@@ -150,6 +150,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
                 }
             };
             decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener);
+            decor.invalidate();
         }
     }