Merge "Revert "Fix delayed offload session start issue"" into main