Fix video width.
Merge branch 'develop' into staging