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

* commit '7026617e74cc1753ae7c1846e005dc7b3286170d':
  Respect style boundaries when measuring text