Merge "Revert "Simplify TextureView draw path""