Merge "Refactor initializing of DesktopRepository." into main