Merge "DO NOT MERGE Revert back to old udfps haptics experience" into sc-v2-dev