Merge "Prevent treeview node text from overflowing"