Merge changes from topic "udc-settings-subtitle" into udc-dev

* changes:
  Add subtitle to settings (framework)
  Add framework change for manifest API change