Merge "Fix bug #5274332 TextLayoutCache is having multiple instances"