Merge "Removing shape detection in icon loader lib" into main