Merge "Respect style boundaries when measuring text" into mnc-dev