Merge "Close PIP when PIP activity is finished" into nyc-dev