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