Merge "Add subtitle to settings (settings)" into udc-dev