Merge "Fix privacy dialog text color" into sc-dev