Merge "Don't clear privacy chip click listener" into main