Merge "Move icon factory to framework" into main