Merge "Recents onboarding fixes"