Merge "Add API to add custom close action for PiP."