Improve DX environment detection.
Improve DX environment detection.

rvedam/Mezzano,AugustusHuang/Mezzano,froggey/Mezzano,varjagg/Mezzano,rvedam/Mezzano,AugustusHuang/Mezzano,froggey/Mezzano,varjagg/Mezzano