Merge "Gracefully close pip window after test"