Merge "Simplify TextureView draw path"