Merge pull request #7247 from illume/upstream-0034-dark-alert-contrast