Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev