Merge "Revert "Support High Contrast Text for all canvas types""