Merge "Revert "Remove cyclical dependency from LauncherPrefs."" into main