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