Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev

packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java

@@ -334,12 +334,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
         setIntent(intent);
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        updatePipUI();
-    }
-
     @Override
     public void onEnterAnimationComplete() {
         super.onEnterAnimationComplete();
@@ -391,6 +385,8 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
         } else {
             mTaskStackHorizontalGridView.setSelectedPosition(0);
         }
+
+        updatePipUI();
     }
 
     @Override