Merge "Delay cleaning user tasks until user is removed"