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

* commit '742983e711ba3132cd09e1b277e9de53ae6596d5':
  PIP: Prevent PipOverlayActivity from restarting