Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev