Merge "Converting LauncherPrefs to dagger" into main