Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev