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