Merge "Recognizes the stylus scale gesture in ScaleGestureDetector"