Merge "Fix inconsistent MagnificationGestureHandler state after delegation"