Merge "Revert "Refactor MeasuredText""