Merge change I52479480 into eclair

* changes:
  Retry overlay create if it fails. Bug 2153980.