Merge "Add shader program selection shortcut" into jb-mr2-dev