Merge "Revert "Add trace point into onMeasure/onDraw of TextView"" into main