am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev

* commit '16158852e2d91041df6d3c031cefe4b77f0583aa':
  Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)