Merge "[Settings] Update the filtering logic" into udc-dev