chore(web): Merge branch 'fix/web/state-tokens-and-two-caps' into fix/web/state-change-source-rewrite