Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev