Merge "Update Shader delegates following Change Ib5d33a80"