Merge "Deal more gracefully with null smallIcons." into mnc-dev