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

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