Merge "Fix warnings in DesktopModeAppHelper" into main