Merge "Add UniformNameCache to keep track of unique uniform ids to avoid calculating...