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

* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024