Merge "Remove TV specific methods from Pip interface"