Merge "Delete super-obsolete zen onboarding" into main