SF site switch functionality sometimes flaky

After a recent SF site switch, we were still seeing a few sessions that were trying to escalate to the old URL.  Most of the sessions were redirected to the new URL, but the feature was at time flaky.

We should investigate and fix.