Merge "Update onboarding based on swipe up state" into pi-dev
am: 5995d21a93

Change-Id: Ib664658e297afb0f136f44dd2da86b195adc380f