Fixed duplication of upload retries when more than an account exists in the device
Back to not overwrite by default in uploads recovery