Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev