Merge pull request #8266 from lioncash/shadowing D3DCommon/Shader: Use std::optional where applicable
