Merge "Do not increase backoff before it expires"