Merge "Fix privacy dialog padding" into sc-v2-dev