Merge "Don't force transparent text to be high contrast"