Merge "Reduce updateLinksTimestamp() DB contention"