Merge "Reorganize MeasuredText API"