Merge "Support loading image and paused image for inline video" into honeycomb-mr1