Merge "Fix bad shader code" into jb-mr1-dev