Fixes video player crash #1
Merge branch 'fix/video-player' into develop

* fix/video-player:
  Fixes video player crash #1