Merge "Fix GL shader bugs" into jb-mr1-dev