Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread."