Merge branch 'stable-2.9'

* stable-2.9:
  Fix comment box font colors of dark CM themes

Change-Id: I08393870c856fab507fe160f92e7ca7457fe5a5c