Merge "Cleanup copy_account_with_retry_enabled" into main