Merge "Use the correct dataspace in shaders.cpp" into tm-dev