Merge "Fixes to Privacy Dialog" into sc-dev