Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev