Merge "TV PIP: Fix broken TV PIP" into oc-dev
am: 2e0d455177

Change-Id: If3a85b43b3d1dc27aefe58253888b96d2710f673