Merge branch 'hotfix/hotfix'
Tablet viewport fix
Merge branch 'hotfix/hotfix' into develop