Merge "Moving LauncherIcons to dagger" into main