Merge "PIP: Fix NPE when an activity is PIPed again immediately" into nyc-dev