Fixed a bug on default screen size
Merge branch 'hotfix-screensize' into develop