CE port of "Fix page refresh in retry_until"

What does this MR do?

CE port of "Fix page refresh in retry_until"

Conformity

• Changelog entry
• Documentation created/updated or follow-up review issue created
• Code review guidelines
• Merge request performance guidelines
• Style guides
• Database guides
• Separation of EE specific content