Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev