Merge "Don't crash on Settings data usage" into nyc-dev