Merge "SurfaceTexture: add tests for buffer leaks"