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

Change-Id: Ie1c2304fc59da877f3fc80a718113deb4eb1ae7c