Merge "Move dump preferred activities to the ComputerEngine" into sc-dev