Merge change I74fdf8c6 into eclair

* changes:
  Fix device dpi handling in the Layout device parsing/UI.