This will become unnecessary after my fix for the deployed code lands, and it also fixes the toolbar to a certain size. Do you need it right now to unblock you, or can you wait a little while?