Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb