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

am: bd34103c5d

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

Change-Id: I3c0785fa6a862d41210b124ab8836c0594990457

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 {