Merge "Make sure preserved surface is removed when it's no longer needed" into nyc-dev