Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev