Merge "Change namespace of flag to 'onboarding'" into main