Merge "Correct error in window lifetime." into nyc-dev