Merge "Update onboarding based on swipe up state" into pi-dev