Merge "Update the text wrapping API." into tm-dev