Merge "Remove enroll haptic feedback since it's now part of the framework."