Merge change 8087

* changes:
  Fix the media button style to use dip instead of px.