Merge "Fix some Holo text color bugs" into jb-mr1-dev