See context in ENG-2504.
One serious issue remains here: the PersistGate makes initial client-side render not match SSR, which results in double-rendering the page on web. Not sure why this wasn't an issue before. It unfortunately affects prod just like dev, so this diff on its own won't fix things.