Merge "Revert^2 "Revert "Provide IconProvider in sysui dagger""" into sc-v2-dev