Merge "Visual changes in OngoingPrivacyChip"