Merge changes I9c92d3cb,I98e2dea9 into main

* changes:
  Increase slider for haptic hint iterations
  Enables ENABLE_SEARCH_HAPTIC_COMMIT