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

* commit '991e76a8a309c1982bc6f9e125a65b806d626762':