Merge "PIP: Close PIP if media session is gone" into nyc-dev