Fixes couple of regressions in the video playback
Merge pull request #1016 from yurydelendik/video-6

Fixes couple of regressions in the video playback