Merge "Fix issue with leaked preserved surface" into pi-dev