Merge "Update removeTaskInternal Desktop case" into main