Merge "Revert "Reorganize MeasuredText API""