Merge "Improvements to ScaleGestureDetector"