Merge "b/4070489 Jumpy motion when switching fingers during zoom gesture."