Master independently refreshed the same stale web aria goldens this branch had absorbed in 08aa0ca54, so every conflict was golden-vs-golden with no source overlap. Goldens are recorded rather than merged: master's recordings win here, and the following commit re-records to reapply this branch's one added occupancy segment on top of them.