Merge "Update UDFPS haptics take #1" into sc-v2-dev