Merge "Fix final UDFPS enrollment haptic." into tm-dev