Merge changes I5e42dee6,Ic8571c08

* changes:
  [RefactoredBMS] Ensure backup doesn't reuse ack tokens nearby in time
  [RefactoredBMS] Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice