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