am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev

* commit '040d89bb0a4563d93073b7a27b3f201ce11dcf58':
  Eliminate race condition around backup completion + resumption