Repair removeFromToolbar() to handle image buttons

Bug: 29440
Change-Id: Ic30af1a1d5842a8f330344eb4a10ecbdc2606fc5
Merge "Repair removeFromToolbar() to handle image buttons"