Fix bug: screen size determination workaround that was added for new larger screen sizes messes things up for other cases.
Merge branch 'bug-fix-display-size-helpers' into add-another-display-helper