Merge "Reorganize RefreshLinksJob code slightly and avoid deprecated functions"