Merge "Handle Surface::lock errors in TextureView Bug #8689535"