Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1