Merge change I61741f5a into eclair

* changes:
  Fix high density bug 2179543: use 'dip' instead of 'px'