Merge "Remove Special App Access duplicate from Setting search" into oc-dev