Merge "Add SafeSites related content filters preference." into main