TUP-2257: fix the problem of resize when the zoom is not 100%
Merge branch 'maintenance/5.6'