Merge "Fixed testPinchIn to calculate expected touch down points correctly." into klp-dev