Merge "Fix delayed offload session start issue" into main