Merge "[SettingsProvider] only increment generation of unset settings if new setting is non-predefined" into udc-dev