Merge "Only update privacy chip when privacy items change"