chore(web): Merge branch 'fix/web/recognizer-polish-and-source-uniqueness' into refactor/web/common-layout-typing