Merge "Moving some common functionality to IconLoaderLib" into sc-dev