Merge "Add restored tasks with persisted activity to hierarchy" into sc-dev