BLD-1057: Fix Video player in FF.

rebased version of #3643 to be against release
@polesye 
@valera-rozuvan