Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219

am: 8453136b8e

* commit '8453136b8ee7ba361d4180df75328466292c9610':
  Fix Activity Transition mess-up.

Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1

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 {