Merge "Caching texture instead of textureSet in TextureManager" into devel/master