Merge "Add breakStrategy attribute to TextView"