Merge "Fix icon-related crash." into mnc-dev