Manual backport of visited records dimming (#2693, #2767)

#2693 was never backported due to a merge commit; manually applied #2693 and #2767 to main-hotfix and fixed a subsequent migrate failure.