am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1

* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613