Merge remote-tracking branch 'upstream/dev' into dev_tracker_snmp

homeassistant/components/media_player/kodi.py

@@ -167,7 +167,7 @@ class KodiDevice(MediaPlayerDevice):
     def media_content_id(self):
         """ Content ID of current playing media. """
         if self._item is not None:
-            return self._item['uniqueid']
+            return self._item.get('uniqueid', None)
 
     @property
     def media_content_type(self):