am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack...

am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev
automerge: b8e51390

* commit 'b8e51390':
  Don't restore persistent task to a stack until needed.