Merge "Fix color contrast for privacy dashboard" into sc-dev