Merge "Convert IconShape to use Dagger" into main