Merge "Further refine touchMajor processing in ScaleGestureDetector" into jb-mr1-dev