Various minor magnification improvements

Addressing previous commebnts on MagnificationGestureHandler

Test: ensure magnification still works as expected
Change-Id: I918a2db6549e8cf7e0b0907ce8758bab8abb7307
9 files changed