Merge "Prevent onboarding counters from overflow." into pi-dev