Merge "Optimize: Use measureText instead of doLayout." into nyc-dev