Merge changes from topic "am-77544f60c4994bb88fbb6624ada6d03f" into main

* changes:
  [automerger skipped] Merge "[SettingsProvider] do not crash the system if config settings files are broken" into udc-qpr-dev am: fb224c59 am: ccf92b97 -s ours
  [automerger skipped] Merge changes from topic "295555884" into udc-qpr-dev am: 03aae8eb am: e9ec1109 -s ours
  [automerger skipped] [SettingsProvider] limit individual setting length am: eabdf5da am: 57b6d4b5 -s ours