Merge changes I4ca1f68d,I5272a045

* changes:
  Moving TV PIP logic to the PIP sub package.
  Adding PIP logic for phones.