Merge "Fix error trap in SurfaceTexture Client"