Merge "Fixes in OngoingPrivacyDialog"