Merge "Revert "Revert "Extend unfreeze recents duration when running un..."" into main