Merge "Properly tear down TextureView"