Merge "Fix light default theme" into jb-mr1-dev