Merge "Refactor MeasuredText"