Merge "Fix subtle copying bug in primeShaderCache" into tm-dev