Merge "Make RefreshLinksJob de-duplication more robust"