am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1

* commit 'b490d8d6214114391622b4302ca2f5f39b2166c6':
  Improve handling of small largeIcons in tablet ticker.