Merge "Moving LauncherAppWidgetHolder to dagger" into main