Merge "Implement custom PiP close action on TV." into tm-dev