Merge "Use square cubemap textures in negative tests" into nyc-dev