Merge "[Settings] Remove redundant code." into udc-dev