Merge "Update TextLayout logging"