Merge "Limit gestureType API to testAPI"