Merge "Don't update TextureView's surface if the Layer doesn't exist"