Merge "Fix JobServiceContext leak issue" into main