Merge "Fixing regression in PiP TV." into oc-dev