Merge "Make delete dialog match spec." into nyc-dev