Merge "Adds helper methods in SearchUiManager and OnboardingPrefs." into tm-dev