am b3c34125: am 3a7bea59: am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf

* commit 'b3c34125a483b321bd91025f88058c58844cde2e':
  Use the icon bounds for all calculations.