Merge changes I3bdb8efb,I1f8628c3 into main

* changes:
  Correctly report package index in RestoreObserver#onUpdate calls
  Refactor observer call in finalizeRestore