Merge "Change MediaController look b/5584613" into ics-mr1