Merge "Deleting ActivityView" into sc-dev