Merge "Fix atomic ssbo xor test" into nyc-dev