Merge "[SettingsProvider] tracking generation of non-predefined unset settings" into udc-dev