Merge "Feature Flag for expanded Privacy Indicators" into main