Merge "Fix duplicate onFingerDown calls in UdfpsController" into udc-qpr-dev