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