Merge "PIP: Prevent PipOverlayActivity from restarting" into nyc-dev