Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0