Merge "Refactor enterDesktop." into main