Merge "Fix fingerprint dialog color contrast for dark theme"