am 4741f6a4: Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev

* commit '4741f6a4c7c7d705d6b7907798a3bb89b2501e9b':
  TextView: Make sure the contentRect is within visibile bounds.