Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1