Merge "Delete confirmation and notification improvements." into nyc-dev