Merge "Add hyphenation to customize button text." into tm-dev