am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb

* commit '1324e3b1a4246f77d516b37fa98013ffad91268e':
  Fix the presentation video resolution when it is different from the actual image resolution of the video.