am c48d2f78: am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit 'c48d2f780f5ef14af574f3c3d6668cb03470e50d':
  Respect style boundaries when measuring text