Merge change 26627 into eclair

* changes:
  Convert instances of px in default UI styles to dip.