Merge "Handle running task launch properly in desktop mode" into main