Merge "Implement design on privacy dialog" into sc-dev