Merge "Fix crash with HTML5 video." into ics-mr1