Merge "Fixing regression in PiP TV." into oc-dev am: 244e4854c3
am: 3152f5b4e6

Change-Id: Ie53f7c78709d5b71bf26d746d1c0966b8afc5fbd