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

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