Merge "Shift focus when a task with multiple activities gets removed" into tm-qpr-dev