Merge "App onboarding fixes"