Merge "Add FeatureProvider for onboarding related settings" into main