Decouple "zoom/scaling the canvas" from zoom out mode (without mode rename)

Decouple "zoom/scaling the canvas" from zoom out mode (without mode rename) #4895