Merge changes from topic "295555884" into udc-qpr-dev

* changes:
  [SettingsProvider] clean up if a setting failed to be serialized
  [SettingsProvider] limit individual setting length