Merge "Revert "Revert "Reset the frozen recents list state prior to tes..."" into main