Merge "Reorganize MeasuredText API (2nd)"