Merge "Fix NPE in clearTexture()" into nyc-dev