am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev

* commit 'cbb286b8594c56161f2765023a73d8200e426f9b':
  Do not defer removal for empty tasks or activities