Merge "Icon API tuneups:" into mnc-dev