Merge "Improvements to RefreshLinksJob/DeleteLinksJob locking"