base

Merge change 22008 into eclair

* changes:
  When bringing up the media controller view, focus the play/pause button.