Merge "Asset for video poster" into honeycomb-mr1