[wip] race-condition-in-pc-when-hyperlinking-between-projects-1001880 (DO NOT REVIEW THIS)

This is a working in progress of #1001880, and I'm opening a PR just to see if 1) I've fixed the original issue, and 2) if the changes lead to new flaky tests. Will closing this PR myself once I gathered the information I need.