Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.