Merge "If zen settings are updated, don't show onboarding"