Merge "Version 2 of Ongoing Privacy Dialog"