Merge "Eliminate race condition around backup completion + resumption" into lmp-dev