Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1