Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev