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

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