Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev