Merge "Add trace point for the text measurement/draw" into main