Merge "Up contrast for empty overflow text" into rvc-dev