Merge "Zoom onto cursor position properly." into main