Merge "Implement swipe up and quick scrub onboarding" into pi-dev
am: 08a2028228

Change-Id: Ie6a41f240dda33edcfa8f5015ae0884ca9701e94