chore(web): Merge branch 'refactor/web/osk-desktop-header-footer' into refactor/web/osk-header-footer-encapsulation