Merge "Fix color of text in widget picker" into jb-mr1-dev