Merge "Error check in queuebuffer in SurfaceTextureClient"