Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev