Merge "move lock/unlock implementaion outside of Surface into SurfaceTextureClient"