Merge "Move ContextualSearchHapticManager to Dagger" into main