Merge "[Settings] Remove redundant sort" into udc-dev