Merge "Fix bug on High Contrast Text : where DarkTheme is enabled && ForceDarkAllowed is true." into sc-dev