Merge "Update Icon find shared library resources" into sc-dev