Fixes #2761 - Fix bugs with image annotation sizing
Fixes #2762 - Add "Shift" modifier when resizing annotations to
preserve aspect ratio