Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev