Merge "No divider between floating toolbar item groups" into pi-dev