Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev