Merge "PipManager: Revisit the logic for PIP close for TV app case" into nyc-dev