The zoomed image was not properly scaled after screen rotation
Merge remote-tracking branch 'origin/develop' into develop