Merge "Fix failing TextureViewTest"