I now use an external player (MPC-BE for madVR and with refresh rate switching enabled) to play all MKV files (my entire movie library is MKV only). I have Kodi set up to play all other file types and since trailers I've downloaded have always been MOV or MP4 the internal Kodi player would play those (with refresh rate switching disabled in the settings). Works perfectly for my setup.