Merge "[MOD/onboarding] Switch to v3 component spec"