Merge "Tweaks for ScaleGestureDetector" into nyc-dev