Merge "Enables server side control of search hint haptic parameters" into main