Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev