Merge "Ensure dismiss button within closePipWindow"