Merge "Revert "Revert "Simplify TextureView draw path"""