Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev