Merge "Adjust graphics dataspace references to new standard" into nyc-dev