Merge "Use TextureSet instead when sorting render items." into devel/master