Merge "Update configurable udfps haptics" into sc-dev