Merge changes I204d0ba7,Ifc51143b,I4b15fac9

* changes:
  Show swipe up onboarding after 2 apps instead of 3
  Change swipe up onboarding color based on nav bar color
  Add swipe up onboarding from apps