Merge "Add ripple to privacy dialog" into sc-dev