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

Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec