am 09804e41: Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev

* commit '09804e41daa31f95a6050892866b24eea32eb4cf':
  Add isQuickScaleEnabled to ScaleGestureDetector