Merge "Adds Search Onboarding count and renames existing edu pref." into tm-dev