Merge "Add "Sensitive Content" public view" into main