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

Change-Id: I4693beb2a51eb78f04aa559ae5ae2115ee3f1108