Merge "Null check when reconstituting legacy icon data." into mnc-dev