Merge "Update recents onboarding logic" into sc-dev