Merge "Dialog and chip for privacy showing"