Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev