Merge "Shader changes to allow for more flexible constant binding."