Merge "Revert "Add "incrementEventCountBy" function to OnboardingPrefs."" into tm-dev