Merge "TextureView: clean up displaylists" into nyc-mr1-dev