am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1

* commit '90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
  Fix crash with HTML5 video.