Merge pull request #951 from shuffle2/Anti-Ultimate-master Prevent changing adapters during emulation and VideoConfigDiag cleanup
