Merge "Remove accessibility duplicates in settings search" into oc-dev