Merge "Revert "Remove Unused parts of LauncherPrefs causing cyclical dependency."" into main