Merge "Fix formatting issues in desktop files." into main