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

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