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

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