SCI-1458

Change By Matt Gerring

This fixes SCI-1458 for me. It brakes SCI-808 for cases where the axis change while
dragging the ROI. Currently that's not a concern for me, though.