am 5c61d17f: am 8f006edb: Prevent exception in production when icons collide during bind

* commit '5c61d17f0ff67440ce9fb578043a4507b537aa0c':
  Prevent exception in production when icons collide during bind