Fixes the regression where the viewport is way too large after an optimal zoom...

Fixes the regression where the viewport is way too large after an optimal zoom operation (cf. #660).
6 jobs for zoom-viewport-fix in 240 minutes and 3 seconds (queued for 2 seconds)