Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d

am: b148f83ec0

* commit 'b148f83ec0f7b77e18d1e6c0d6072bedc19349f0':
  Fix Activity Transition mess-up.

Change-Id: I4bf8510cb21e4f35f1a935f2885b14bc511c47ac

core/java/android/app/Activity.java

@@ -5948,7 +5948,7 @@ public class Activity extends ContextThemeWrapper
      * @return true if this is the topmost, non-finishing activity in its task.
      */
     private boolean isTopOfTask() {
-        if (mToken == null || mWindow == null || !mWindowAdded) {
+        if (mToken == null || mWindow == null) {
             return false;
         }
         try {