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