Merge "Add code owners for desktop" into main