am b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev

* commit 'b0f3f8dbea32c8566ae29af4b9e2fcb904588c4f':
  Fix incorrectly inverted text color.