Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"