Merge "Fix some bugs in the new ScaleGestureDetector logic."