We upgraded our controls and now our toolbar buttons are moved to a drop down button to the right. There is plenty of room for our buttons, but they still go into the menu. I've attached a screenshot.
As for the items collapsing in a grid - the table layout of the grid must be set to fixed for this to work at all, because otherwise the table will take the width of its contents (the toolbar) and not the other way around:
<MasterTableView TableLayout="Fixed"
I am attaching here an example based on the following resources that works fine for me: