Merge "Fix floating toolbar menu item spacing." into pi-dev