Merge "Do not fetch tasks that don't have activities." into klp-dev