Merge "Don't crash settings when out of space." into nyc-dev