am 92dd1abe: Update restored task uid to match the package uid on current device.
automerge: 7fd985f

* commit '7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
  Update restored task uid to match the package uid on current device.