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

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