Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev