Merge "Refactor DesktopModeLaunchParamsModifer" into main