Merge "Fix intents in OngoingPrivacyDialog"