Merge "Revert "Reset the frozen recents list state when switching to bu..."" into main