Merge "Update Settings to use the proper DeviceConfig API." into qt-dev