Merge "Remove edge slop handling from ScaleGestureDetector." into jb-dev