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

Change-Id: Ic3d5d6f34a5ee9ddd231efc973576b57394b281f