Merge "Fix an infinite loop in TextureView implementation"