Merge "Using performHapticFeedback on UdfpsController" into udc-qpr-dev