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

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