Merge "TextLayout cache - update size and improve logging"