Merge "MagnificationGestureHandler refactoring and unit test"