Merge "Exclude Privacy Settings from search if Safety Center is enabled"