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