Merge "Make the text for the drop target buttons fit if it's too long." into tm-dev