Merge "Adjust recents onboarding logic" into pi-dev