Merge "Fix memory leak in ShaderCache" into pi-dev