chore(web): Merge branch 'refactor/web/specialized-osk-views' into refactor/web/osk-activation-and-visibility