Merge "Fix TextureView glitch and memory leak"