Merge "[Settings] Hide package name if needed" into udc-dev