Merge "Update zen onboarding"