Small merge issue fixed.
Fixed issue with video playback.