Merge "Revert immutable Shader change" into lmp-dev